sync: Add --enable-sync-sessions-v2 and necessary plumbing to use SessionsSyncManager.

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

 // 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 "chrome/browser/sync/test/integration/sessions_helper.h"
 
 #include <algorithm>
 
 #include "base/stl_util.h"
 #include "base/test/test_timeouts.h"
@@ skipping 33 matching lines @@
 }
 
 void ScopedWindowMap::Reset(SessionWindowMap* windows) {
   STLDeleteContainerPairSecondPointers(windows_.begin(), windows_.end());
   windows_.clear();
   std::swap(*windows, windows_);
 }
 
 bool GetLocalSession(int index, const browser_sync::SyncedSession** session) {
   return ProfileSyncServiceFactory::GetInstance()->GetForProfile(
-      test()->GetProfile(index))->GetSessionModelAssociator()->GetLocalSession(
-          session);
+      test()->GetProfile(index))->GetSessionModelAssociatorDeprecated()->
+          GetLocalSession(session);
 }
 
 bool ModelAssociatorHasTabWithUrl(int index, const GURL& url) {
   content::RunAllPendingInMessageLoop();
   const browser_sync::SyncedSession* local_session;
   if (!GetLocalSession(index, &local_session)) {
     return false;
   }
 
   if (local_session->windows.size() == 0) {
@@ skipping 63 matching lines @@
     while (!found) {
       found = ModelAssociatorHasTabWithUrl(index, *it);
       if (base::TimeTicks::Now() >= end_time) {
         LOG(ERROR) << "Failed to find all tabs after "
                    << TestTimeouts::action_max_timeout().InSecondsF()
                    << " seconds.";
         return false;
       }
       if (!found) {
         ProfileSyncServiceFactory::GetInstance()->GetForProfile(
-            test()->GetProfile(index))->GetSessionModelAssociator()->
+            test()->GetProfile(index))->GetSessionModelAssociatorDeprecated()->
             BlockUntilLocalChangeForTest(TestTimeouts::action_max_timeout());
         content::RunMessageLoop();
       }
     }
   }
   return true;
 }
 
 bool GetLocalWindows(int index, SessionWindowMap* local_windows) {
   // The local session provided by GetLocalSession is owned, and has lifetime
@@ skipping 43 matching lines @@
   if (!GetLocalSession(index, &local_session)) {
     return 0;
   }
   return local_session->windows.size();
 }
 
 int GetNumForeignSessions(int index) {
   SyncedSessionVector sessions;
   if (!ProfileSyncServiceFactory::GetInstance()->GetForProfile(
           test()->GetProfile(index))->
-          GetSessionModelAssociator()->GetAllForeignSessions(&sessions))
+          GetSessionModelAssociatorDeprecated()->GetAllForeignSessions(
+              &sessions)) {
     return 0;
+  }
   return sessions.size();
 }
 
 bool GetSessionData(int index, SyncedSessionVector* sessions) {
   if (!ProfileSyncServiceFactory::GetInstance()->GetForProfile(
           test()->GetProfile(index))->
-          GetSessionModelAssociator()->GetAllForeignSessions(sessions))
+          GetSessionModelAssociatorDeprecated()->GetAllForeignSessions(
+              sessions)) {
     return false;
+  }
   SortSyncedSessions(sessions);
   return true;
 }
 
 bool CompareSyncedSessions(const browser_sync::SyncedSession* lhs,
                            const browser_sync::SyncedSession* rhs) {
   if (!lhs ||
       !rhs ||
       lhs->windows.size() < 1 ||
       rhs->windows.size() < 1) {
@@ skipping 83 matching lines @@
                       *(windows[window_index].Get())))
       return false;
   }
 
   return true;
 }
 
 void DeleteForeignSession(int index, std::string session_tag) {
   ProfileSyncServiceFactory::GetInstance()->GetForProfile(
       test()->GetProfile(index))->
-      GetSessionModelAssociator()->DeleteForeignSession(session_tag);
+      GetSessionModelAssociatorDeprecated()->DeleteForeignSession(session_tag);
 }
 
 }  // namespace sessions_helper