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

Unified Diff: chrome/test/live_sync/two_client_live_sessions_sync_test.cc

Issue 5705004: [SYNC] Sessions datatype refactor. Most things related to sessions under-the-... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Rebase Created 9 years, 11 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/test/live_sync/single_client_live_sessions_sync_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/live_sync/two_client_live_sessions_sync_test.cc
===================================================================
--- chrome/test/live_sync/two_client_live_sessions_sync_test.cc (revision 70604)
+++ chrome/test/live_sync/two_client_live_sessions_sync_test.cc (working copy)
@@ -21,8 +21,8 @@
GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1));
// Get foreign session data from client 1.
- ScopedVector<ForeignSession> sessions1;
- ASSERT_TRUE(GetSessionData(1, &sessions1.get()));
+ std::vector<const ForeignSession*> sessions1;
+ ASSERT_TRUE(GetSessionData(1, &sessions1));
// Verify client 1's foreign session matches client 0 current window.
ASSERT_EQ(1U, sessions1.size());
@@ -47,10 +47,10 @@
ASSERT_TRUE(AwaitQuiescence());
// Get foreign session data from client 0 and 1.
- ScopedVector<ForeignSession> sessions0;
- ScopedVector<ForeignSession> sessions1;
- ASSERT_TRUE(GetSessionData(0, &sessions0.get()));
- ASSERT_TRUE(GetSessionData(1, &sessions1.get()));
+ std::vector<const ForeignSession*> sessions0;
+ std::vector<const ForeignSession*> 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.
@@ -59,4 +59,3 @@
ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows));
ASSERT_TRUE(WindowsMatch(sessions0[0]->windows, *client1_windows));
}
-
« no previous file with comments | « chrome/test/live_sync/single_client_live_sessions_sync_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698