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

chrome/browser/ui/webui/favicon_source.cc

Index: chrome/browser/ui/webui/favicon_source.cc
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index d5744acac3588dec5558197be09d552d9322640a..765b8040db8142c66b91263382fa707bb84982fa 100644
--- a/chrome/browser/ui/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_io_context.h"
-#include "chrome/browser/sync/glue/session_model_associator.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/common/favicon/favicon_url_parser.h"
@@ -143,13 +143,13 @@ bool FaviconSource::HandleMissingResource(const IconRequest& request) {
   // If the favicon is not available, try to use the synced favicon.
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile_);
-  browser_sync::SessionModelAssociator* associator = sync_service ?
-      sync_service->GetSessionModelAssociator() : NULL;
+  browser_sync::OpenTabsUIDelegate* open_tabs = sync_service ?
+      sync_service->GetOpenTabsUIDelegate() : NULL;
 
   scoped_refptr<base::RefCountedMemory> response;
-  if (associator &&
-      associator->GetSyncedFaviconForPageURL(request.request_path.spec(),
-                                             &response)) {
+  if (open_tabs &&
+      open_tabs->GetSyncedFaviconForPageURL(request.request_path.spec(),
+                                            &response)) {
     request.callback.Run(response.get());
     return true;
   }