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

chrome/browser/android/favicon_helper.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/android/favicon_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
-#include "chrome/browser/sync/glue/session_model_associator.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/browser/sync/profile_sync_service_factory.h"
 #include "jni/FaviconHelper_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/color_analysis.h"
 #include "ui/gfx/color_utils.h"
 
 using base::android::ScopedJavaGlobalRef;
@@ skipping 85 matching lines @@
   Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
   DCHECK(profile);
 
   std::string page_url = ConvertJavaStringToUTF8(env, j_page_url);
 
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile);
   DCHECK(sync_service);
 
   scoped_refptr<base::RefCountedMemory> favicon_png;
-  browser_sync::SessionModelAssociator* associator =
-      sync_service->GetSessionModelAssociator();
-  DCHECK(associator);
+  browser_sync::OpenTabsUIDelegate* open_tabs =
+      sync_service->GetOpenTabsUIDelegate();
+  DCHECK(open_tabs);
 
-  if (!associator->GetSyncedFaviconForPageURL(page_url, &favicon_png))
+  if (!open_tabs->GetSyncedFaviconForPageURL(page_url, &favicon_png))
     return ScopedJavaLocalRef<jobject>();
 
     // Convert favicon_image_result to java objects.
   gfx::Image favicon_image = gfx::Image::CreateFrom1xPNGBytes(
       favicon_png->front(), favicon_png->size());
   SkBitmap favicon_bitmap = favicon_image.AsBitmap();
 
   ScopedJavaLocalRef<jobject> j_favicon_bitmap;
   if (favicon_bitmap.isNull())
     return ScopedJavaLocalRef<jobject>();
@@ skipping 18 matching lines @@
   return color_utils::CalculateKMeanColorOfPNG(
       png_data, min_darkness, max_brightness, &sampler);
 }
 
 FaviconHelper::~FaviconHelper() {}
 
 // static
 bool FaviconHelper::RegisterFaviconHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }