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)); |
} |
- |