[Enhanced Bookmark]Upstream image fetching code in android

components/enhanced_bookmarks/bookmark_image_service.cc

Index: components/enhanced_bookmarks/bookmark_image_service.cc
diff --git a/components/enhanced_bookmarks/bookmark_image_service.cc b/components/enhanced_bookmarks/bookmark_image_service.cc
index c2c019e7677ac4c38038a0433dfd5e63ae3db131..ab94f1e8c0bf9af54f6e4b26b42de9e6a4acbbb9 100644
--- a/components/enhanced_bookmarks/bookmark_image_service.cc
+++ b/components/enhanced_bookmarks/bookmark_image_service.cc
@@ -101,7 +101,7 @@ void BookmarkImageService::Shutdown() {
 void BookmarkImageService::SalientImageForUrl(const GURL& page_url,
                                               ImageCallback callback) {
   DCHECK(CalledOnValidThread());
-  SalientImageForUrl(page_url, true, callback);
+  SalientImageFromWeb(page_url, callback);
 }
 
 void BookmarkImageService::RetrieveImageFromStore(const GURL& page_url,
@@ -160,31 +160,33 @@ void BookmarkImageService::FetchCallback(const GURL& page_url,
     // url set on a bookmark, and then enqueue the request for the record to
     // be triggered when the retrieval is finished.
     RetrieveSalientImageForPageUrl(page_url);
-    SalientImageForUrl(page_url, false, original_callback);
+    SalientImageFromLocal(page_url, original_callback);
   }
 }
 
-void BookmarkImageService::SalientImageForUrl(const GURL& page_url,
-                                              bool fetch_from_bookmark,
-                                              ImageCallback callback) {
+void BookmarkImageService::SalientImageFromLocal(const GURL& page_url,
+                                                 ImageCallback callback) {
   DCHECK(CalledOnValidThread());
-
   // If the request is done while the image is currently being retrieved, just
   // store the appropriate callbacks to call once the image is retrieved.
   if (IsPageUrlInProgress(page_url)) {
     callbacks_[page_url].push_back(callback);
     return;
   }
+  RetrieveImageFromStore(page_url, callback);
+}
 
-  if (!fetch_from_bookmark) {
-    RetrieveImageFromStore(page_url, callback);
-  } else {
-    RetrieveImageFromStore(page_url,
-                           base::Bind(&BookmarkImageService::FetchCallback,
-                                      base::Unretained(this),
-                                      page_url,
-                                      callback));
+void BookmarkImageService::SalientImageFromWeb(const GURL& page_url,
+                                               ImageCallback callback) {
+  // If the request is done while the image is currently being retrieved, just

[lpromero, 2015/02/04 13:54:51]

Add DCHECK called on valid thread.

[Ian Wen, 2015/02/05 18:33:17]

Reverted the signature change.

+  // store the appropriate callbacks to call once the image is retrieved.
+  if (IsPageUrlInProgress(page_url)) {
+    callbacks_[page_url].push_back(callback);
+    return;

[noyau (Ping after 24h), 2015/02/04 12:45:27]

The refactoring leads to the duplication of this code, something that I was
trying to avoid originally. Personally I prefer the original version and don't
see an improvement on readability here.

[Ian Wen, 2015/02/05 18:33:17]

Reverted.

   }
+  RetrieveImageFromStore(
+      page_url, base::Bind(&BookmarkImageService::FetchCallback,
+                           base::Unretained(this), page_url, callback));
 }
 
 void BookmarkImageService::ProcessNewImage(const GURL& page_url,