[Sync] Fix Session's handling of windows.

chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc

Index: chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
index 2aa14e9a86e41885260d5cd44324f64b9cc49558..244dec5f283bf8c6a4f1daf5ab1ace8632a858ce 100644
--- a/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_sessions_sync_test.cc
@@ -12,6 +12,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 SingleClientSessionsSyncTest : public SyncTest {
@@ -28,10 +30,10 @@ IN_PROC_BROWSER_TEST_F(SingleClientSessionsSyncTest, Sanity) {
 
   ASSERT_TRUE(CheckInitialState(0));
 
-  ScopedVector<SessionWindow> old_windows;
+  ScopedWindowMap old_windows;
   ASSERT_TRUE(OpenTabAndGetLocalWindows(0,
                                         GURL("about:bubba"),
-                                        old_windows.get()));
+                                        old_windows.GetMutable()));
 
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(
       "Waiting for session change."));
@@ -42,7 +44,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientSessionsSyncTest, Sanity) {
   ASSERT_EQ(0U, sessions.size());
 
   // Verify client didn't change.
-  ScopedVector<SessionWindow> new_windows;
-  ASSERT_TRUE(GetLocalWindows(0, new_windows.get()));
-  ASSERT_TRUE(WindowsMatch(old_windows.get(), new_windows.get()));
+  ScopedWindowMap new_windows;
+  ASSERT_TRUE(GetLocalWindows(0, new_windows.GetMutable()));
+  ASSERT_TRUE(WindowsMatch(*old_windows.Get(), *new_windows.Get()));
 }