Replace enhanced bookmarks salient images with favicons

chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc

Index: chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc
diff --git a/chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc b/chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc
index 446f1727e1b487e0a58b584e42466707e3794d57..856af2041fd8ff8a64fa57163f8c68bec0983aa5 100644
--- a/chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc
+++ b/chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc
@@ -7,8 +7,6 @@
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.h"
-#include "chrome/browser/enhanced_bookmarks/android/bookmark_image_service_factory.h"
 #include "chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/common/chrome_version_info.h"
@@ -30,29 +28,6 @@ using bookmarks::BookmarkNode;
 using bookmarks::BookmarkType;
 using content::WebContents;
 using content::BrowserThread;
-using enhanced_bookmarks::ImageRecord;
-
-namespace {
-
-void Callback(ScopedJavaGlobalRef<jobject>* j_callback,
-              scoped_refptr<ImageRecord> image_record) {
-  JNIEnv* env = base::android::AttachCurrentThread();
-
-  scoped_ptr<ScopedJavaGlobalRef<jobject> > j_callback_ptr(j_callback);
-  ScopedJavaLocalRef<jstring> j_url =
-      base::android::ConvertUTF8ToJavaString(env, image_record->url.spec());
-
-  SkBitmap bitmap = image_record->image->AsBitmap();
-  ScopedJavaLocalRef<jobject> j_bitmap;
-  if (!bitmap.isNull()) {
-    j_bitmap = gfx::ConvertToJavaBitmap(&bitmap);
-  }
-
-  enhanced_bookmarks::android::Java_SalientImageCallback_onSalientImageReady(
-      env, j_callback_ptr->obj(), j_bitmap.Release(), j_url.Release());
-}
-
-}  // namespace
 
 namespace enhanced_bookmarks {
 namespace android {
@@ -64,36 +39,12 @@ EnhancedBookmarksBridge::EnhancedBookmarksBridge(JNIEnv* env,
   enhanced_bookmark_model_ =
       EnhancedBookmarkModelFactory::GetForBrowserContext(profile_);
   enhanced_bookmark_model_->SetVersionSuffix(chrome::VersionInfo().OSType());
-  bookmark_image_service_ = static_cast<BookmarkImageServiceAndroid*>(
-      BookmarkImageServiceFactory::GetForBrowserContext(profile_));
 }
 
 void EnhancedBookmarksBridge::Destroy(JNIEnv*, jobject) {
   delete this;
 }
 
-void EnhancedBookmarksBridge::SalientImageForUrl(JNIEnv* env,
-                                                 jobject obj,
-                                                 jstring j_url,
-                                                 jobject j_callback) {
-  DCHECK(j_callback);
-
-  GURL url(base::android::ConvertJavaStringToUTF16(env, j_url));
-  scoped_ptr<ScopedJavaGlobalRef<jobject>> j_callback_ptr(
-      new ScopedJavaGlobalRef<jobject>());
-  j_callback_ptr->Reset(env, j_callback);
-  bookmark_image_service_->SalientImageForUrl(
-      url, base::Bind(&Callback, j_callback_ptr.release()));
-}
-
-void EnhancedBookmarksBridge::FetchImageForTab(JNIEnv* env,
-                                               jobject obj,
-                                               jobject j_web_contents) {
-  WebContents* web_contents = WebContents::FromJavaWebContents(j_web_contents);
-  bookmark_image_service_->RetrieveSalientImageFromContext(
-      web_contents, web_contents->GetURL(), true);
-}
-
 ScopedJavaLocalRef<jobject> EnhancedBookmarksBridge::AddFolder(JNIEnv* env,
     jobject obj,
     jobject j_parent_id_obj,