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

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

Index: chrome/browser/sync/test/integration/sessions_helper.cc
diff --git a/chrome/browser/sync/test/integration/sessions_helper.cc b/chrome/browser/sync/test/integration/sessions_helper.cc
index fa90917599a093825010293b324fbf099f466083..c315a694c4601ba376dcddd63a6961d3d1b19631 100644
--- a/chrome/browser/sync/test/integration/sessions_helper.cc
+++ b/chrome/browser/sync/test/integration/sessions_helper.cc
@@ -51,8 +51,8 @@ void ScopedWindowMap::Reset(SessionWindowMap* 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) {
@@ -136,7 +136,7 @@ bool WaitForTabsToLoad(int index, const std::vector<GURL>& urls) {
       }
       if (!found) {
         ProfileSyncServiceFactory::GetInstance()->GetForProfile(
-            test()->GetProfile(index))->GetSessionModelAssociator()->
+            test()->GetProfile(index))->GetSessionModelAssociatorDeprecated()->
             BlockUntilLocalChangeForTest(TestTimeouts::action_max_timeout());
         content::RunMessageLoop();
       }
@@ -200,16 +200,20 @@ 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;
 }
@@ -313,7 +317,7 @@ bool CheckForeignSessionsAgainst(
 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