[Suggestions] Make ThumbnailManager implement ImageManager

chrome/browser/search/suggestions/thumbnail_manager.cc

 // 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.
 
 #include "chrome/browser/search/suggestions/thumbnail_manager.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 
 using leveldb_proto::ProtoDatabase;
 
 namespace {
 
 // From JPEG-encoded bytes to SkBitmap.
 SkBitmap* DecodeThumbnail(const std::vector<unsigned char>& encoded_data) {
   return gfx::JPEGCodec::Decode(&encoded_data[0], encoded_data.size());
 }
-}
+
+}  // namespace
 
 namespace suggestions {
 
 ThumbnailManager::ThumbnailManager() : weak_ptr_factory_(this) {}
 
 ThumbnailManager::ThumbnailManager(
     net::URLRequestContextGetter* url_request_context,
     scoped_ptr<ProtoDatabase<ThumbnailData> > database,
     const base::FilePath& database_dir)
     : url_request_context_(url_request_context),
       database_(database.Pass()),
       database_ready_(false),
       weak_ptr_factory_(this) {
   database_->Init(database_dir, base::Bind(&ThumbnailManager::OnDatabaseInit,
                                            weak_ptr_factory_.GetWeakPtr()));
 }
 
 ThumbnailManager::~ThumbnailManager() {}
 
 ThumbnailManager::ThumbnailRequest::ThumbnailRequest() : fetcher(NULL) {}
 
 ThumbnailManager::ThumbnailRequest::ThumbnailRequest(chrome::BitmapFetcher* f)
     : fetcher(f) {}
 
 ThumbnailManager::ThumbnailRequest::~ThumbnailRequest() { delete fetcher; }
 
-void ThumbnailManager::InitializeThumbnailMap(
-    const SuggestionsProfile& suggestions) {
+void ThumbnailManager::Initialize(const SuggestionsProfile& suggestions) {
   thumbnail_url_map_.clear();
   for (int i = 0; i < suggestions.suggestions_size(); ++i) {
     const ChromeSuggestion& suggestion = suggestions.suggestions(i);
     if (suggestion.has_thumbnail()) {
       thumbnail_url_map_[GURL(suggestion.url())] = GURL(suggestion.thumbnail());
     }
   }
 }
 
-void ThumbnailManager::GetPageThumbnail(
+void ThumbnailManager::GetImageForURL(
     const GURL& url,
     base::Callback<void(const GURL&, const SkBitmap*)> callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   // If |url| is not found in |thumbnail_url_map_|, then invoke |callback| with
   // NULL since there is no associated thumbnail for this |url|.
   GURL thumbnail_url;
   if (!GetThumbnailURL(url, &thumbnail_url)) {
     callback.Run(url, NULL);
     return;
   }
 
   // |database_| can be null if something went wrong in initialization.

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

NIT: NULL

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

Done.

   if (database_.get() && !database_ready_) {
     // Once database is initialized, it will serve pending requests from either
     // cache or network.
     QueueCacheRequest(url, thumbnail_url, callback);
     return;
   }
 
   ServeFromCacheOrNetwork(url, thumbnail_url, callback);
 }
 
@@ skipping 189 matching lines @@
   if (!bitmap.readyToDraw() || bitmap.isNull()) {
     return false;
   }
   return gfx::JPEGCodec::Encode(
       reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0)),
       gfx::JPEGCodec::FORMAT_SkBitmap, bitmap.width(), bitmap.height(),
       bitmap.width() * bitmap.bytesPerPixel(), 100, dest);
 }
 
 }  // namespace suggestions