[Doodle] Move image fetching from LogoBridge to DoodleService

chrome/browser/android/logo_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/android/logo_bridge.h"
 
 #include <jni.h>
 #include <stdint.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/android/chrome_feature_list.h"
 #include "chrome/browser/android/logo_service.h"
 #include "chrome/browser/doodle/doodle_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
-#include "chrome/browser/search/suggestions/image_decoder_impl.h"
-#include "components/image_fetcher/core/image_fetcher_impl.h"
 #include "components/search_provider_logos/logo_tracker.h"
 #include "jni/LogoBridge_jni.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 using base::android::ToJavaByteArray;
 
 namespace {
 
-const int64_t kMaxImageDownloadBytes = 1024 * 1024;
-
 ScopedJavaLocalRef<jobject> MakeJavaLogo(JNIEnv* env,
                                          const SkBitmap* bitmap,
                                          const GURL& on_click_url,
                                          const std::string& alt_text,
                                          const GURL& animated_url) {
   ScopedJavaLocalRef<jobject> j_bitmap = gfx::ConvertToJavaBitmap(bitmap);
 
   ScopedJavaLocalRef<jstring> j_on_click_url;
   if (on_click_url.is_valid())
     j_on_click_url = ConvertUTF8ToJavaString(env, on_click_url.spec());
@@ skipping 138 matching lines @@
 LogoBridge::LogoBridge(jobject j_profile)
     : logo_service_(nullptr),
       doodle_service_(nullptr),
       doodle_observer_(this),
       weak_ptr_factory_(this) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile);
   DCHECK(profile);
 
   if (base::FeatureList::IsEnabled(chrome::android::kUseNewDoodleApi)) {
     doodle_service_ = DoodleServiceFactory::GetForProfile(profile);
-    image_fetcher_ = base::MakeUnique<image_fetcher::ImageFetcherImpl>(
-        base::MakeUnique<suggestions::ImageDecoderImpl>(),
-        profile->GetRequestContext());
-    image_fetcher_->SetImageDownloadLimit(kMaxImageDownloadBytes);
-
     doodle_observer_.Add(doodle_service_);
   } else {
     logo_service_ = LogoServiceFactory::GetForProfile(profile);
   }
 
   animated_logo_fetcher_ = base::MakeUnique<AnimatedLogoFetcher>(
       profile->GetRequestContext());
 }
 
 LogoBridge::~LogoBridge() {}
@@ skipping 59 matching lines @@
 void LogoBridge::NotifyNoLogoAvailable(bool from_cache) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_LogoObserver_onLogoAvailable(env, j_logo_observer_,
                                     ScopedJavaLocalRef<jobject>(), from_cache);
 }
 
 void LogoBridge::FetchDoodleImage(const doodle::DoodleConfig& doodle_config,
                                   bool from_cache) {
   DCHECK(!j_logo_observer_.is_null());
 
-  // If there is a CTA image, that means the main image is animated. Show the
+  // If there is a CTA image, that means the main image is animated. We show the
   // non-animated CTA image first, and load the animated one only when the
   // user requests it.
   bool has_cta = doodle_config.large_cta_image.has_value();
-  const GURL& image_url = has_cta ? doodle_config.large_cta_image->url
-                                  : doodle_config.large_image.url;
   const GURL& animated_image_url =
       has_cta ? doodle_config.large_image.url : GURL::EmptyGURL();
-  // TODO(treib): For interactive doodles, use |fullpage_interactive_url|

[fhorschig, 2017/05/15 13:54:35]

Why has that changed?

[Marc Treib, 2017/05/15 14:25:21]

Sorry, I meant to comment on that and then forgot :(

target_url now contains the right thing also for interactive doodles (and in
fact, fullpage_interactive_url doesn't even exist anymore).

-  // instead of |target_url|?
   const GURL& on_click_url = doodle_config.target_url;
   const std::string& alt_text = doodle_config.alt_text;
-  image_fetcher_->StartOrQueueNetworkRequest(
-      image_url.spec(), image_url,
+  doodle_service_->GetImage(
       base::Bind(&LogoBridge::DoodleImageFetched, base::Unretained(this),
                  from_cache, on_click_url, alt_text, animated_image_url));
 }
 
-void LogoBridge::DoodleImageFetched(
-    bool config_from_cache,
-    const GURL& on_click_url,
-    const std::string& alt_text,
-    const GURL& animated_image_url,
-    const std::string& image_fetch_id,
-    const gfx::Image& image,
-    const image_fetcher::RequestMetadata& metadata) {
+void LogoBridge::DoodleImageFetched(bool config_from_cache,
+                                    const GURL& on_click_url,
+                                    const std::string& alt_text,
+                                    const GURL& animated_image_url,
+                                    const gfx::Image& image) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
-  if (image.IsEmpty()) {
-    DLOG(WARNING) << "Failed to download doodle image";
-    Java_LogoObserver_onLogoAvailable(env, j_logo_observer_,
-                                      ScopedJavaLocalRef<jobject>(),
-                                      config_from_cache);
-    return;
+  ScopedJavaLocalRef<jobject> j_logo;
+  if (!image.IsEmpty()) {
+    j_logo = MakeJavaLogo(env, image.ToSkBitmap(), on_click_url, alt_text,
+                          animated_image_url);
   }
 
-  UMA_HISTOGRAM_BOOLEAN("NewTabPage.LogoImageDownloaded",
-                        metadata.from_http_cache);
-
-  ScopedJavaLocalRef<jobject> j_logo = MakeJavaLogo(
-      env, image.ToSkBitmap(), on_click_url, alt_text, animated_image_url);
   Java_LogoObserver_onLogoAvailable(env, j_logo_observer_, j_logo,
                                     config_from_cache);
 }
 
 // static
 bool RegisterLogoBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }