[Suggestions] Make ThumbnailManager implement ImageManager

chrome/browser/search/suggestions/thumbnail_manager.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_THUMBNAIL_MANAGER_H_
 #define CHROME_BROWSER_SEARCH_SUGGESTIONS_THUMBNAIL_MANAGER_H_
 
 #include <map>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
+#include "chrome/browser/search/suggestions/image_manager.h"
 #include "chrome/browser/search/suggestions/proto/suggestions.pb.h"
 #include "components/leveldb_proto/proto_database.h"
 #include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace suggestions {
 
 class SuggestionsProfile;
 class ThumbnailData;
 
 // A class used to fetch server thumbnails asynchronously and manage the caching
 // layer (both in memory and on disk).
-class ThumbnailManager : public chrome::BitmapFetcherDelegate {
+class ThumbnailManager : public ImageManager,
+                         public chrome::BitmapFetcherDelegate {
  public:
   typedef std::vector<ThumbnailData> ThumbnailVector;
 
   ThumbnailManager(
       net::URLRequestContextGetter* url_request_context,
       scoped_ptr<leveldb_proto::ProtoDatabase<ThumbnailData> > database,
       const base::FilePath& database_dir);
   virtual ~ThumbnailManager();
 
   // Initializes the |thumbnail_url_map_| with the proper mapping from website

[huangs, 2014/07/17 18:23:35]

Add something similar to
// ImageManager interface.
Update comment to match image_manager.h's, or simply remove it.

[Mathieu, 2014/07/17 18:29:13]

Done.

   // URL to thumbnail URL.
-  void InitializeThumbnailMap(const SuggestionsProfile& suggestions);
+  virtual void Initialize(const SuggestionsProfile& suggestions) OVERRIDE;
 
   // Retrieves stored thumbnail for website |url| asynchronously. Calls
   // |callback| with Bitmap pointer if found, and NULL otherwise. Should be
   // called from the UI thread.
-  void GetPageThumbnail(
+  virtual void GetImageForURL(

[huangs, 2014/07/17 18:23:35]

// ImageManager interface.

The UI thread constraint departs from the base classes.  If it's a property of
this class, then comment as such.  Otherwise leave things the way they are.

[Mathieu, 2014/07/17 18:29:13]

Done.

       const GURL& url,
-      base::Callback<void(const GURL&, const SkBitmap*)> callback);
+      base::Callback<void(const GURL&, const SkBitmap*)> callback) OVERRIDE;
 
  private:
   friend class MockThumbnailManager;
   friend class ThumbnailManagerBrowserTest;
-  FRIEND_TEST_ALL_PREFIXES(ThumbnailManagerTest, InitializeThumbnailMapTest);
+  FRIEND_TEST_ALL_PREFIXES(ThumbnailManagerTest, InitializeTest);
   FRIEND_TEST_ALL_PREFIXES(ThumbnailManagerBrowserTest,
-                           GetPageThumbnailNetworkCacheHit);
+                           GetImageForURLNetworkCacheHit);
   FRIEND_TEST_ALL_PREFIXES(ThumbnailManagerBrowserTest,
-                           GetPageThumbnailNetworkCacheNotInitialized);
+                           GetImageForURLNetworkCacheNotInitialized);
 
   // Used for testing.
   ThumbnailManager();
 
   typedef std::vector<base::Callback<void(const GURL&, const SkBitmap*)> >
       CallbackVector;
   typedef base::hash_map<std::string, SkBitmap> ThumbnailMap;
 
   // State related to a thumbnail fetch (associated website url, thumbnail_url,
   // fetcher, pending callbacks).
@@ skipping 90 matching lines @@
   bool database_ready_;
 
   base::WeakPtrFactory<ThumbnailManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ThumbnailManager);
 };
 
 }  // namespace suggestions
 
 #endif  // CHROME_BROWSER_SEARCH_SUGGESTIONS_THUMBNAIL_MANAGER_H_