Replace SkBitmap with gfx::Image in the ImageFetcher API.

components/suggestions/image_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 COMPONENTS_SUGGESTIONS_IMAGE_MANAGER_H_
 #define COMPONENTS_SUGGESTIONS_IMAGE_MANAGER_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 43 matching lines @@
 
   // Should be called from the UI thread.
   virtual void AddImageURL(const GURL& url, const GURL& image_url);
 
   // Should be called from the UI thread.
   virtual void GetImageForURL(
       const GURL& url,
       base::Callback<void(const GURL&, const SkBitmap*)> callback);
 
  protected:
+  // Methods inherited from image_fetcher::ImageFetcherDelegate
+
   // Perform additional tasks when an image has been fetched.
-  void OnImageFetched(const GURL& url, const SkBitmap* bitmap) override;
+  void OnImageFetched(const GURL& url, const gfx::Image& image) override;
 
  private:
   friend class MockImageManager;
   friend class ImageManagerTest;
   FRIEND_TEST_ALL_PREFIXES(ImageManagerTest, InitializeTest);
   FRIEND_TEST_ALL_PREFIXES(ImageManagerTest, AddImageURL);
   FRIEND_TEST_ALL_PREFIXES(ImageManagerTest, GetImageForURLNetworkCacheHit);
   FRIEND_TEST_ALL_PREFIXES(ImageManagerTest,
                            GetImageForURLNetworkCacheNotInitialized);
 
@@ skipping 80 matching lines @@
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<ImageManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageManager);
 };
 
 }  // namespace suggestions
 
 #endif  // COMPONENTS_SUGGESTIONS_IMAGE_MANAGER_H_