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

chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_ENHANCED_BOOKMARKS_ANDROID_BOOKMARK_IMAGE_SERVICE_ANDROID_H_
 #define CHROME_BROWSER_ENHANCED_BOOKMARKS_ANDROID_BOOKMARK_IMAGE_SERVICE_ANDROID_H_
 
+#include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
 #include "components/enhanced_bookmarks/bookmark_image_service.h"
-#include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
+#include "content/public/common/referrer.h"
 
 namespace chrome {
 class BitmapFetcher;
 }
 
 namespace content {
 class BrowserContext;
 class RenderFrameHost;
 class WebContents;
 }
 
 namespace enhanced_bookmarks {
 
 class BookmarkImageServiceAndroid : public BookmarkImageService {
  public:
   explicit BookmarkImageServiceAndroid(content::BrowserContext* browserContext);
 
   ~BookmarkImageServiceAndroid() override;
 
   void RetrieveSalientImage(const GURL& page_url,
                             const GURL& image_url,
                             const std::string& referrer,
                             net::URLRequest::ReferrerPolicy referrer_policy,
                             bool update_bookmark) override;
 
   // Searches the current page for a salient image, if a url is found the image
   // is fetched and stored.
   void RetrieveSalientImageFromContext(
-      content::RenderFrameHost* render_frame_host,
+      content::WebContents* web_contents,
       const GURL& page_url,
       bool update_bookmark);
 
   // Investigates if the tab points to a bookmarked url in needs of an updated
   // image. If it is, invokes RetrieveSalientImageFromContext() for the relevant
   // urls.
   void FinishSuccessfulPageLoadForTab(content::WebContents* web_contents,
                                       bool update_bookmark);
 
  private:
-  void RetrieveSalientImageFromContextCallback(const GURL& page_url,
+  // The callback for dom_initializer_script_. Once the DOM is initialized,
+  // this method starts execution of get_salient_image_url_script_.
+  void InitializeDomCallback(blink::WebReferrerPolicy policy,
+                             content::RenderFrameHost* render_frame_host,
+                             const GURL& page_url,
+                             bool update_bookmark,
+                             const base::Value* result);
+
+  // The callback for get_salient_image_url_srcipt. Parses the JSON from
+  // execution of get_salient_image_url_script_ to determine the URL for the
+  // salient image and invokes RetrieveSalientImage.
+  void RetrieveSalientImageFromContextCallback(blink::WebReferrerPolicy policy,
+                                               const GURL& page_url,
                                                bool update_bookmark,
                                                const base::Value* result);
 
   scoped_ptr<gfx::Image> ResizeImage(const gfx::Image& image) override;
 
   content::BrowserContext* browser_context_;
+
+  // The script injected in a page to initialize the DOM before extracting image
+  // urls.
+  base::string16 dom_initializer_script_;
+
   // The script injected in a page to extract image urls.
-  base::string16 script_;
+  base::string16 get_salient_image_url_script_;
+
   // Maximum size for retrieved salient images in pixels. This is used when
   // resizing an image.
   gfx::Size max_size_;
 
   class BitmapFetcherHandler : private chrome::BitmapFetcherDelegate {
    public:
     explicit BitmapFetcherHandler(BookmarkImageServiceAndroid* service,
                                   const GURL& image_url)
         : service_(service), bitmap_fetcher_(image_url, this) {}
     void Start(content::BrowserContext* browser_context,
@@ skipping 15 matching lines @@
 
     DISALLOW_COPY_AND_ASSIGN(BitmapFetcherHandler);
   };
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkImageServiceAndroid);
 };
 
 }  // namespace enhanced_bookmarks
 
 #endif  // CHROME_BROWSER_ENHANCED_BOOKMARKS_ANDROID_BOOKMARK_IMAGE_SERVICE_ANDROID_H_