Revert "Revert of Refactor get_salient_image_url.js to use DocumentImageExtractor"

chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc

 // Copyright 2014 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/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h"
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 97 matching lines @@
   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->GetMainFrame(), web_contents->GetURL(), true);
+      web_contents, web_contents->GetURL(), true);
 }
 
 ScopedJavaLocalRef<jstring> EnhancedBookmarksBridge::GetBookmarkDescription(
     JNIEnv* env, jobject obj, jlong id, jint type) {
   DCHECK(enhanced_bookmark_model_->loaded());
   if (type != BookmarkType::BOOKMARK_TYPE_NORMAL) {
     return base::android::ConvertUTF8ToJavaString(env, std::string());
   }
 
   const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(
@@ skipping 188 matching lines @@
   return reinterpret_cast<jlong>(new EnhancedBookmarksBridge(
         env, obj, ProfileAndroid::FromProfileAndroid(j_profile)));
 }
 
 bool RegisterEnhancedBookmarksBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace enhanced_bookmarks