[Doodle] Move image fetching from LogoBridge to DoodleService

chrome/browser/android/logo_bridge.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_ANDROID_LOGO_BRIDGE_H_
 #define CHROME_BROWSER_ANDROID_LOGO_BRIDGE_H_
 
 #include <jni.h>
 
 #include <memory>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "base/scoped_observer.h"
 #include "components/doodle/doodle_service.h"
 
 class LogoService;
 
 namespace doodle {
 class DoodleService;
 }  // namespace doodle
 
 namespace gfx {
 class Image;
 }  // namespace gfx
 
-namespace image_fetcher {
-class ImageFetcher;
-struct RequestMetadata;
-}  // namespace image_fetcher
-
 // The C++ counterpart to LogoBridge.java. Enables Java code to access the
 // default search provider's logo.
 class LogoBridge : public doodle::DoodleService::Observer {
  public:
   explicit LogoBridge(jobject j_profile);
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
 
   // TODO(treib): Double-check the observer contract (esp. for LogoTracker).
   // Gets the current non-animated logo (downloading it if necessary) and passes
   // it to the observer.
@@ skipping 25 matching lines @@
   void OnDoodleConfigUpdated(
       const base::Optional<doodle::DoodleConfig>& maybe_doodle_config) override;
 
   void NotifyNoLogoAvailable(bool from_cache);
   void FetchDoodleImage(const doodle::DoodleConfig& doodle_config,
                         bool from_cache);
   void 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);
+                          const gfx::Image& image);
 
   // Only valid if UseNewDoodleApi is disabled.
   LogoService* logo_service_;
 
   // Only valid if UseNewDoodleApi is enabled.
   doodle::DoodleService* doodle_service_;
-  std::unique_ptr<image_fetcher::ImageFetcher> image_fetcher_;
   base::android::ScopedJavaGlobalRef<jobject> j_logo_observer_;
   ScopedObserver<doodle::DoodleService, doodle::DoodleService::Observer>
       doodle_observer_;
 
   std::unique_ptr<AnimatedLogoFetcher> animated_logo_fetcher_;
 
   base::WeakPtrFactory<LogoBridge> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LogoBridge);
 };
 
 bool RegisterLogoBridge(JNIEnv* env);
 
 #endif  // CHROME_BROWSER_ANDROID_LOGO_BRIDGE_H_