Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5649)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc

Issue 7966020: [Sync] Fix Session's handling of windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits, rebase. Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc ('k') | chrome/browser/ui/webui/ntp/foreign_session_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
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
index be0221385ac20c94b92747b460a06b5557f7b441..874ffab53827d473904973aed7fb171d33edaac2 100644
--- a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
@@ -13,6 +13,8 @@ using sessions_helper::CheckInitialState;
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 {
@@ -38,8 +40,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, SingleClientChanged) {
ASSERT_TRUE(CheckInitialState(0));
ASSERT_TRUE(CheckInitialState(1));
- ScopedVector<SessionWindow> client0_windows;
- ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1), client0_windows.get()));
+ ScopedWindowMap client0_windows;
+ ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
+ client0_windows.GetMutable()));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
@@ -49,7 +52,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, SingleClientChanged) {
// 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()));
+ ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
}
IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
@@ -77,8 +80,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
ASSERT_TRUE(CheckInitialState(0));
ASSERT_TRUE(CheckInitialState(1));
- ScopedVector<SessionWindow> client0_windows;
- ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1), client0_windows.get()));
+ ScopedWindowMap client0_windows;
+ ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
+ client0_windows.GetMutable()));
ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
@@ -89,7 +93,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
// 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()));
+ ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
}
IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
@@ -113,10 +117,12 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, BothChanged) {
ASSERT_TRUE(CheckInitialState(1));
// Open tabs on both clients and retain window information.
- ScopedVector<SessionWindow> client0_windows;
- ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL2), client0_windows.get()));
- ScopedVector<SessionWindow> client1_windows;
- ASSERT_TRUE(OpenTabAndGetLocalWindows(1, GURL(kURL1), client1_windows.get()));
+ 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());
@@ -131,8 +137,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, BothChanged) {
// 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()));
+ ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
+ ASSERT_TRUE(WindowsMatch(sessions0[0]->windows, *client1_windows.Get()));
}
IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
@@ -142,8 +148,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
ASSERT_TRUE(CheckInitialState(0));
ASSERT_TRUE(CheckInitialState(1));
- ScopedVector<SessionWindow> client0_windows;
- ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1), client0_windows.get()));
+ ScopedWindowMap client0_windows;
+ ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
+ client0_windows.GetMutable()));
ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
GetClient(0)->service()->SetPassphrase(kValidPassphrase, true);
@@ -171,7 +178,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
// Verify client 1's foreign session matches client 0's current window and
// vice versa.
ASSERT_EQ(1U, sessions1.size());
- ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, client0_windows.get()));
+ ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
}
// Flaky (number of conflicting nodes is off). http://crbug.com/89604.
@@ -194,8 +201,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
ASSERT_EQ(8, GetClient(1)->GetLastSessionSnapshot()->
num_conflicting_updates); // The encrypted nodes.
- ScopedVector<SessionWindow> client0_windows;
- ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1), client0_windows.get()));
+ ScopedWindowMap client0_windows;
+ ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
+ client0_windows.GetMutable()));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->
num_blocking_conflicting_updates);
@@ -215,7 +223,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
// Verify client 1's foreign session matches client 0's current window and
// vice versa.
ASSERT_EQ(1U, sessions1.size());
- ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, client0_windows.get()));
+ ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
}
IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
@@ -239,8 +247,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
// These changes are either made with the old passphrase or not encrypted at
// all depending on when client 0's changes are propagated.
- ScopedVector<SessionWindow> client1_windows;
- ASSERT_TRUE(OpenTabAndGetLocalWindows(1, GURL(kURL1), client1_windows.get()));
+ ScopedWindowMap client1_windows;
+ ASSERT_TRUE(OpenTabAndGetLocalWindows(1, GURL(kURL1),
+ client1_windows.GetMutable()));
ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->
num_blocking_conflicting_updates);
@@ -272,8 +281,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
ASSERT_TRUE(CheckInitialState(1));
// These changes are either made on client 1 without encryption.
- ScopedVector<SessionWindow> client1_windows;
- ASSERT_TRUE(OpenTabAndGetLocalWindows(1, GURL(kURL1), client1_windows.get()));
+ ScopedWindowMap client1_windows;
+ ASSERT_TRUE(OpenTabAndGetLocalWindows(1, GURL(kURL1),
+ client1_windows.GetMutable()));
ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
// Turn encryption on client 0. Client 1's foreign will be encrypted with the
@@ -305,7 +315,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
ASSERT_TRUE(GetSessionData(0, &sessions0));
ASSERT_FALSE(GetSessionData(1, &sessions1));
ASSERT_EQ(1U, sessions0.size());
- ASSERT_TRUE(WindowsMatch(sessions0[0]->windows, client1_windows.get()));
+ ASSERT_TRUE(WindowsMatch(sessions0[0]->windows, *client1_windows.Get()));
}
IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
@@ -322,8 +332,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
// These changes will sync over to client 1, who will be unable to decrypt
// them due to the missing passphrase.
- ScopedVector<SessionWindow> client0_windows;
- ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1), client0_windows.get()));
+ ScopedWindowMap client0_windows;
+ ASSERT_TRUE(OpenTabAndGetLocalWindows(0, GURL(kURL1),
+ client0_windows.GetMutable()));
ASSERT_TRUE(EnableEncryption(0, syncable::SESSIONS));
ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
ASSERT_EQ(0, GetClient(1)->GetLastSessionSnapshot()->
@@ -340,8 +351,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
ASSERT_TRUE(GetClient(1)->WaitForTypeEncryption(syncable::SESSIONS));
// Open windows on client 1, which should automatically be encrypted.
- ScopedVector<SessionWindow> client1_windows;
- ASSERT_TRUE(OpenTabAndGetLocalWindows(1, GURL(kURL2), client1_windows.get()));
+ ScopedWindowMap client1_windows;
+ ASSERT_TRUE(OpenTabAndGetLocalWindows(1, GURL(kURL2),
+ client1_windows.GetMutable()));
ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
ASSERT_TRUE(IsEncrypted(0, syncable::SESSIONS));
@@ -356,6 +368,6 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest,
// 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()));
+ ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows.Get()));
+ ASSERT_TRUE(WindowsMatch(sessions0[0]->windows, *client1_windows.Get()));
}
« no previous file with comments | « chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc ('k') | chrome/browser/ui/webui/ntp/foreign_session_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698