Replace the usage of SkBitmap with gfx::Image in the suggestion service.

components/suggestions/suggestions_service.h

-// Copyright 2014 The Chromium Authors. All rights reserved.

[Marc Treib, 2016/05/20 14:40:04]

nit: We don't update the copyright headers.

[markusheintz_, 2016/05/23 13:20:47]

Done.

+// Copyright 2016 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_SUGGESTIONS_SERVICE_H_
 #define COMPONENTS_SUGGESTIONS_SUGGESTIONS_SERVICE_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/callback_list.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/suggestions/proto/suggestions.pb.h"
 #include "components/sync_driver/sync_service_observer.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
+namespace gfx {
+class Image;
+}
+
 namespace net {
 class URLRequestContextGetter;
 }  // namespace net
 
 namespace sync_driver {
 class SyncService;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }  // namespace user_prefs
 
 class OAuth2TokenService;
 class SigninManagerBase;
-class SkBitmap;
 
 namespace suggestions {
 
 class BlacklistStore;
 class ImageManager;
 class SuggestionsStore;
 
 // An interface to fetch server suggestions asynchronously.
 class SuggestionsService : public KeyedService,
                            public net::URLFetcherDelegate,
                            public sync_driver::SyncServiceObserver {
  public:
   using ResponseCallback = base::Callback<void(const SuggestionsProfile&)>;
-  using BitmapCallback = base::Callback<void(const GURL&, const SkBitmap*)>;
+  using BitmapCallback = base::Callback<void(const GURL&, const gfx::Image&)>;
 
   using ResponseCallbackList =
       base::CallbackList<void(const SuggestionsProfile&)>;
 
   SuggestionsService(const SigninManagerBase* signin_manager,
                      OAuth2TokenService* token_service,
                      sync_driver::SyncService* sync_service,
                      net::URLRequestContextGetter* url_request_context,
                      std::unique_ptr<SuggestionsStore> suggestions_store,
                      std::unique_ptr<ImageManager> thumbnail_manager,
@@ skipping 154 matching lines @@
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<SuggestionsService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SuggestionsService);
 };
 
 }  // namespace suggestions
 
 #endif  // COMPONENTS_SUGGESTIONS_SUGGESTIONS_SERVICE_H_