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

chrome/browser/extensions/api/sessions/sessions_api.cc

 // Copyright 2013 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/extensions/api/sessions/sessions_api.h"
 
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/extensions/api/sessions/session_id.h"
 #include "chrome/browser/extensions/api/tabs/windows_util.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_function_registry.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/tab_restore_service_delegate.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
-#include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/glue/synced_session.h"
+#include "chrome/browser/sync/open_tabs_ui_delegate.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/error_utils.h"
 #include "net/base/net_util.h"
@@ skipping 312 matching lines @@
 bool SessionsGetDevicesFunction::RunImpl() {
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(GetProfile());
   if (!(service && service->GetPreferredDataTypes().Has(syncer::SESSIONS))) {
     // Sync not enabled.
     results_ = GetDevices::Results::Create(
         std::vector<linked_ptr<api::sessions::Device> >());
     return true;
   }
 
-  browser_sync::SessionModelAssociator* associator =
-      service->GetSessionModelAssociator();
+  browser_sync::OpenTabsUIDelegate* open_tabs =
+      service->GetOpenTabsUIDelegate();
   std::vector<const browser_sync::SyncedSession*> sessions;
-  if (!(associator && associator->GetAllForeignSessions(&sessions))) {
+  if (!(open_tabs && open_tabs->GetAllForeignSessions(&sessions))) {
     results_ = GetDevices::Results::Create(
         std::vector<linked_ptr<api::sessions::Device> >());
     return true;
   }
 
   scoped_ptr<GetDevices::Params> params(GetDevices::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
   if (params->filter && params->filter->max_results) {
     EXTENSION_FUNCTION_VALIDATE(*params->filter->max_results >= 0 &&
         *params->filter->max_results <= api::sessions::MAX_SESSION_RESULTS);
@@ skipping 121 matching lines @@
 }
 
 bool SessionsRestoreFunction::RestoreForeignSession(const SessionId& session_id,
                                                     Browser* browser) {
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(GetProfile());
   if (!(service && service->GetPreferredDataTypes().Has(syncer::SESSIONS))) {
     SetError(kSessionSyncError);
     return false;
   }
-  browser_sync::SessionModelAssociator* associator =
-      service->GetSessionModelAssociator();
-  if (!associator) {
+  browser_sync::OpenTabsUIDelegate* open_tabs =
+      service->GetOpenTabsUIDelegate();
+  if (!open_tabs) {
     SetError(kSessionSyncError);
     return false;
   }
 
   const SessionTab* tab = NULL;
-  if (associator->GetForeignTab(session_id.session_tag(),
-                                session_id.id(),
-                                &tab)) {
+  if (open_tabs->GetForeignTab(session_id.session_tag(),
+                               session_id.id(),
+                               &tab)) {
     TabStripModel* tab_strip = browser->tab_strip_model();
     content::WebContents* contents = tab_strip->GetActiveWebContents();
 
     content::WebContents* tab_contents =
         SessionRestore::RestoreForeignSessionTab(contents, *tab,
                                                  NEW_FOREGROUND_TAB);
     SetResultRestoredTab(tab_contents);
     return true;
   }
 
   // Restoring a full window.
   std::vector<const SessionWindow*> windows;
-  if (!associator->GetForeignSession(session_id.session_tag(), &windows)) {
+  if (!open_tabs->GetForeignSession(session_id.session_tag(), &windows)) {
     SetInvalidIdError(session_id.ToString());
     return false;
   }
 
   std::vector<const SessionWindow*>::const_iterator window = windows.begin();
   while (window != windows.end()
          && (*window)->window_id.id() != session_id.id()) {
     ++window;
   }
   if (window == windows.end()) {
@@ skipping 44 matching lines @@
 static base::LazyInstance<ProfileKeyedAPIFactory<SessionsAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 ProfileKeyedAPIFactory<SessionsAPI>*
     SessionsAPI::GetFactoryInstance() {
   return &g_factory.Get();
 }
 
 }  // namespace extensions