Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab

1 files changed, 204 insertions, 0 deletions

diff --git a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
new file mode 100644
index 0000000000..50d0a41c67
--- /dev/null
+++ b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
@@ -0,0 +1,204 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/memory/scoped_vector.h"
+#include "chrome/browser/sessions/session_service.h"
+#include "chrome/browser/sync/profile_sync_service_harness.h"
+#include "chrome/browser/sync/test/integration/passwords_helper.h"
+#include "chrome/browser/sync/test/integration/sessions_helper.h"
+#include "chrome/browser/sync/test/integration/sync_test.h"
+#include "sync/internal_api/public/sessions/sync_session_snapshot.h"
+
+using passwords_helper::SetDecryptionPassphrase;
+using passwords_helper::SetEncryptionPassphrase;
+using sessions_helper::CheckInitialState;
+using sessions_helper::DeleteForeignSession;
+using sessions_helper::GetLocalWindows;
+using sessions_helper::GetSessionData;
+using sessions_helper::OpenTabAndGetLocalWindows;
+using sessions_helper::ScopedWindowMap;
+using sessions_helper::SyncedSessionVector;
+using sessions_helper::WindowsMatch;
+
+class TwoClientSessionsSyncTest : public SyncTest {
+ public:
+  TwoClientSessionsSyncTest() : SyncTest(TWO_CLIENT) {}
+  virtual ~TwoClientSessionsSyncTest() {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TwoClientSessionsSyncTest);
+};
+
+static const char* kURL1 = "http://127.0.0.1/bubba1";
+static const char* kURL2 = "http://127.0.0.1/bubba2";
+
+// TODO(zea): Test each individual session command we care about separately.
+// (as well as multi-window). We're currently only checking basic single-window/
+// single-tab functionality.
+
+IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
+                       SingleClientChanged) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+  ASSERT_TRUE(CheckInitialState(0));
+  ASSERT_TRUE(CheckInitialState(1));
+
+  ScopedWindowMap client0_windows;
+  ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
+      client0_windows.GetMutable()));
+
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+
+  // Get foreign session data from client 1.
+  SyncedSessionVector sessions1;
+  ASSERT_TRUE(GetSessionData(1, &sessions1));
+
+  // Verify client 1's foreign session matches client 0 current window.
+  ASSERT_EQ(1U, sessions1.size());
+  ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
+}
+
+IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
+                       SingleClientEnabledEncryption) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+  ASSERT_TRUE(CheckInitialState(0));
+  ASSERT_TRUE(CheckInitialState(1));
+
+  ASSERT_TRUE(EnableEncryption(0, syncer::SESSIONS));
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+  ASSERT_TRUE(IsEncrypted(0, syncer::SESSIONS));
+  ASSERT_TRUE(IsEncrypted(1, syncer::SESSIONS));
+
+  // Should enable encryption for all other types as well. Just check a subset.
+  ASSERT_TRUE(IsEncrypted(1, syncer::PREFERENCES));
+  ASSERT_TRUE(IsEncrypted(1, syncer::BOOKMARKS));
+  ASSERT_TRUE(IsEncrypted(1, syncer::APPS));
+}
+
+IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
+                       SingleClientEnabledEncryptionAndChanged) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+  ASSERT_TRUE(CheckInitialState(0));
+  ASSERT_TRUE(CheckInitialState(1));
+
+  ScopedWindowMap client0_windows;
+  ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
+      client0_windows.GetMutable()));
+  ASSERT_TRUE(EnableEncryption(0, syncer::SESSIONS));
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+
+  // Get foreign session data from client 1.
+  ASSERT_TRUE(IsEncrypted(1, syncer::SESSIONS));
+  SyncedSessionVector sessions1;
+  ASSERT_TRUE(GetSessionData(1, &sessions1));
+
+  // Verify client 1's foreign session matches client 0 current window.
+  ASSERT_EQ(1U, sessions1.size());
+  ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
+}
+
+IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
+                       BothClientsEnabledEncryption) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+  ASSERT_TRUE(CheckInitialState(0));
+  ASSERT_TRUE(CheckInitialState(1));
+
+  ASSERT_TRUE(EnableEncryption(0, syncer::SESSIONS));
+  ASSERT_TRUE(EnableEncryption(1, syncer::SESSIONS));
+  ASSERT_TRUE(AwaitQuiescence());
+  ASSERT_TRUE(IsEncrypted(0, syncer::SESSIONS));
+  ASSERT_TRUE(IsEncrypted(1, syncer::SESSIONS));
+}
+
+IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, BothChanged) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+  ASSERT_TRUE(CheckInitialState(0));
+  ASSERT_TRUE(CheckInitialState(1));
+
+  // Open tabs on both clients and retain window information.
+  ScopedWindowMap client0_windows;
+  ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL2),
+      client0_windows.GetMutable()));
+  ScopedWindowMap client1_windows;
+  ASSERT_TRUE(OpenTabAndGetLocalWindows(1, GURL(kURL1),
+      client1_windows.GetMutable()));
+
+  // Wait for sync.
+  ASSERT_TRUE(AwaitQuiescence());
+
+  // Get foreign session data from client 0 and 1.
+  SyncedSessionVector sessions0;
+  SyncedSessionVector sessions1;
+  ASSERT_TRUE(GetSessionData(0, &sessions0));
+  ASSERT_TRUE(GetSessionData(1, &sessions1));
+
+  // Verify client 1's foreign session matches client 0's current window and
+  // vice versa.
+  ASSERT_EQ(1U, sessions0.size());
+  ASSERT_EQ(1U, sessions1.size());
+  ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
+  ASSERT_TRUE(WindowsMatch(sessions0[0]->windows, *client1_windows.Get()));
+}
+
+IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, DeleteIdleSession) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+  ASSERT_TRUE(CheckInitialState(0));
+  ASSERT_TRUE(CheckInitialState(1));
+
+  // Client 0 opened some tabs then went idle.
+  ScopedWindowMap client0_windows;
+  ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
+      client0_windows.GetMutable()));
+
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+
+  // Get foreign session data from client 1.
+  SyncedSessionVector sessions1;
+  ASSERT_TRUE(GetSessionData(1, &sessions1));
+
+  // Verify client 1's foreign session matches client 0 current window.
+  ASSERT_EQ(1U, sessions1.size());
+  ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
+
+  // Client 1 now deletes client 0's tabs. This frees the memory of sessions1.
+  DeleteForeignSession(1, sessions1[0]->session_tag);
+  ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
+  ASSERT_FALSE(GetSessionData(1, &sessions1));
+}
+
+IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, DeleteActiveSession) {
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+  ASSERT_TRUE(CheckInitialState(0));
+  ASSERT_TRUE(CheckInitialState(1));
+
+  // Client 0 opened some tabs then went idle.
+  ScopedWindowMap client0_windows;
+  ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
+      client0_windows.GetMutable()));
+
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+  SyncedSessionVector sessions1;
+  ASSERT_TRUE(GetSessionData(1, &sessions1));
+  ASSERT_EQ(1U, sessions1.size());
+  ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
+
+  // Client 1 now deletes client 0's tabs. This frees the memory of sessions1.
+  DeleteForeignSession(1, sessions1[0]->session_tag);
+  ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
+  ASSERT_FALSE(GetSessionData(1, &sessions1));
+
+  // Client 0 becomes active again with a new tab.
+  ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL2),
+      client0_windows.GetMutable()));
+  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+  ASSERT_TRUE(GetSessionData(1, &sessions1));
+  ASSERT_EQ(1U, sessions1.size());
+  ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
+}