[Suggestions] Make ThumbnailManager implement ImageManager

chrome/browser/search/suggestions/suggestions_service.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_SEARCH_SUGGESTIONS_SUGGESTIONS_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_SUGGESTIONS_SUGGESTIONS_SERVICE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/cancelable_callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
+#include "chrome/browser/search/suggestions/image_manager.h"
 #include "chrome/browser/search/suggestions/proto/suggestions.pb.h"
-#include "chrome/browser/search/suggestions/thumbnail_manager.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
 namespace net {
 class URLRequestContextGetter;
 }  // namespace net
 
 namespace user_prefs {
@@ skipping 14 matching lines @@
 extern const char kSuggestionsFieldTrialControlParam[];
 extern const char kSuggestionsFieldTrialStateEnabled[];
 
 // An interface to fetch server suggestions asynchronously.
 class SuggestionsService : public KeyedService, public net::URLFetcherDelegate {
  public:
   typedef base::Callback<void(const SuggestionsProfile&)> ResponseCallback;
 
   SuggestionsService(net::URLRequestContextGetter* url_request_context,
                      scoped_ptr<SuggestionsStore> suggestions_store,
-                     scoped_ptr<ThumbnailManager> thumbnail_manager,
+                     scoped_ptr<ImageManager> thumbnail_manager,
                      scoped_ptr<BlacklistStore> blacklist_store);
   virtual ~SuggestionsService();
 
   // Whether this service is enabled.
   static bool IsEnabled();
 
   // Whether the user is part of a control group.
   static bool IsControlGroup();
 
   // Request suggestions data, which will be passed to |callback|. Initiates a
@@ skipping 91 matching lines @@
   // The URL to fetch suggestions data from.
   GURL suggestions_url_;
 
   // Prefix for building the blacklisting URL.
   std::string blacklist_url_prefix_;
 
   // Queue of callbacks. These are flushed when fetch request completes.
   std::vector<ResponseCallback> waiting_requestors_;
 
   // Used to obtain server thumbnails, if available.
-  scoped_ptr<ThumbnailManager> thumbnail_manager_;
+  scoped_ptr<ImageManager> thumbnail_manager_;

[huangs, 2014/07/16 22:22:24]

*If* you're keeping the name "ImageManager", maybe rename variable to match?

[Mathieu, 2014/07/17 16:06:35]

Acknowledged.

 
   net::URLRequestContextGetter* url_request_context_;
 
   // Delay used when scheduling a blacklisting task.
   int blacklist_delay_sec_;
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<SuggestionsService> weak_ptr_factory_;
 
   // Timeout (in ms) before serving requestors after a fetch suggestions request
   // has been issued.
   int request_timeout_ms_;
 
   DISALLOW_COPY_AND_ASSIGN(SuggestionsService);
 };
 
 }  // namespace suggestions
 
 #endif  // CHROME_BROWSER_SEARCH_SUGGESTIONS_SUGGESTIONS_SERVICE_H_