[Media>UI] Follow-up fix for avoiding downloading image twice

chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaImageManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaImageManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaImageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaImageManager.java
index bd45b9dde658b006261f38ce568c931b2cea27c9..444be22d4815a3ed1e0066b68e81c22663bb335c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaImageManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaImageManager.java
@@ -80,7 +80,7 @@ public class MediaImageManager implements ImageDownloadCallback {
     // The last image src for download, used for avoiding fetching the same src when artwork is set
     // multiple times but the same src is chosen.
     //
-    // Will be reset when initiating a new download request, and set to |null| when download failed.
+    // Will be reset when initiating a new download request.
     private String mLastImageSrc;
 
     /**
@@ -134,7 +134,9 @@ public class MediaImageManager implements ImageDownloadCallback {
         mCallback = callback;
         MediaImage image = selectImage(images);
         if (image == null) {
-            onDownloadFailed();
+            mLastImageSrc = null;
+            mCallback.onImageDownloaded(null);
+            clearRequests();
             return;
         }
 
@@ -178,12 +180,8 @@ public class MediaImageManager implements ImageDownloadCallback {
                 bestScore = newScore;
             }
         }
-        if (bestBitmap != null) {
-            mCallback.onImageDownloaded(bestBitmap);
-            clearRequests();
-        } else {
-            onDownloadFailed();
-        }
+        mCallback.onImageDownloaded(bestBitmap);
+        clearRequests();
     }
 
     /**
@@ -210,12 +208,6 @@ public class MediaImageManager implements ImageDownloadCallback {
         mCallback = null;
     }
 
-    private void onDownloadFailed() {
-        mLastImageSrc = null;
-        mCallback.onImageDownloaded(null);
-        clearRequests();
-    }
-
     private double getImageScore(MediaImage image) {
         if (image == null) return 0;
         if (image.getSizes().isEmpty()) return DEFAULT_IMAGE_SIZE_SCORE;