[Suggestions] Rename ThumbnailManager to ImageManagerImpl

chrome/browser/search/suggestions/image_manager_impl.cc

Index: chrome/browser/search/suggestions/image_manager_impl.cc
diff --git a/chrome/browser/search/suggestions/thumbnail_manager.cc b/chrome/browser/search/suggestions/image_manager_impl.cc
similarity index 54%
rename from chrome/browser/search/suggestions/thumbnail_manager.cc
rename to chrome/browser/search/suggestions/image_manager_impl.cc
index abe97fdd0092ae5f27eb0aafa2b6383f9d04eb7f..e271c8b2332ac43003da45f1e8d9db230bb402a0 100644
--- a/chrome/browser/search/suggestions/thumbnail_manager.cc
+++ b/chrome/browser/search/suggestions/image_manager_impl.cc
@@ -2,7 +2,7 @@
 // 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 "chrome/browser/search/suggestions/image_manager_impl.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "content/public/browser/browser_thread.h"
@@ -15,7 +15,7 @@ using leveldb_proto::ProtoDatabase;
 namespace {
 
 // From JPEG-encoded bytes to SkBitmap.
-SkBitmap* DecodeThumbnail(const std::vector<unsigned char>& encoded_data) {
+SkBitmap* DecodeImage(const std::vector<unsigned char>& encoded_data) {
   return gfx::JPEGCodec::Decode(&encoded_data[0], encoded_data.size());
 }
 
@@ -23,47 +23,47 @@ SkBitmap* DecodeThumbnail(const std::vector<unsigned char>& encoded_data) {
 
 namespace suggestions {
 
-ThumbnailManager::ThumbnailManager() : weak_ptr_factory_(this) {}
+ImageManagerImpl::ImageManagerImpl() : weak_ptr_factory_(this) {}
 
-ThumbnailManager::ThumbnailManager(
+ImageManagerImpl::ImageManagerImpl(
     net::URLRequestContextGetter* url_request_context,
-    scoped_ptr<ProtoDatabase<ThumbnailData> > database,
+    scoped_ptr<ProtoDatabase<ImageData> > 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,
+  database_->Init(database_dir, base::Bind(&ImageManagerImpl::OnDatabaseInit,
                                            weak_ptr_factory_.GetWeakPtr()));
 }
 
-ThumbnailManager::~ThumbnailManager() {}
+ImageManagerImpl::~ImageManagerImpl() {}
 
-ThumbnailManager::ThumbnailRequest::ThumbnailRequest() : fetcher(NULL) {}
+ImageManagerImpl::ImageRequest::ImageRequest() : fetcher(NULL) {}
 
-ThumbnailManager::ThumbnailRequest::ThumbnailRequest(chrome::BitmapFetcher* f)
+ImageManagerImpl::ImageRequest::ImageRequest(chrome::BitmapFetcher* f)
     : fetcher(f) {}
 
-ThumbnailManager::ThumbnailRequest::~ThumbnailRequest() { delete fetcher; }
+ImageManagerImpl::ImageRequest::~ImageRequest() { delete fetcher; }
 
-void ThumbnailManager::Initialize(const SuggestionsProfile& suggestions) {
-  thumbnail_url_map_.clear();
+void ImageManagerImpl::Initialize(const SuggestionsProfile& suggestions) {
+  image_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());
+      image_url_map_[GURL(suggestion.url())] = GURL(suggestion.thumbnail());
     }
   }
 }
 
-void ThumbnailManager::GetImageForURL(
+void ImageManagerImpl::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)) {
+  // If |url| is not found in |image_url_map_|, then invoke |callback| with
+  // NULL since there is no associated image for this |url|.
+  GURL image_url;
+  if (!GetImageURL(url, &image_url)) {
     callback.Run(url, NULL);
     return;
   }
@@ -72,29 +72,29 @@ void ThumbnailManager::GetImageForURL(
   if (database_.get() && !database_ready_) {
     // Once database is initialized, it will serve pending requests from either
     // cache or network.
-    QueueCacheRequest(url, thumbnail_url, callback);
+    QueueCacheRequest(url, image_url, callback);
     return;
   }
 
-  ServeFromCacheOrNetwork(url, thumbnail_url, callback);
+  ServeFromCacheOrNetwork(url, image_url, callback);
 }
 
-bool ThumbnailManager::GetThumbnailURL(const GURL& url, GURL* thumbnail_url) {
-  std::map<GURL, GURL>::iterator it = thumbnail_url_map_.find(url);
-  if (it == thumbnail_url_map_.end()) return false;  // Not found.
-  *thumbnail_url = it->second;
+bool ImageManagerImpl::GetImageURL(const GURL& url, GURL* image_url) {
+  std::map<GURL, GURL>::iterator it = image_url_map_.find(url);
+  if (it == image_url_map_.end()) return false;  // Not found.
+  *image_url = it->second;
   return true;
 }
 
-void ThumbnailManager::QueueCacheRequest(
-    const GURL& url, const GURL& thumbnail_url,
+void ImageManagerImpl::QueueCacheRequest(
+    const GURL& url, const GURL& image_url,
     base::Callback<void(const GURL&, const SkBitmap*)> callback) {
   // To be served when the database has loaded.
-  ThumbnailRequestMap::iterator it = pending_cache_requests_.find(url);
+  ImageRequestMap::iterator it = pending_cache_requests_.find(url);
   if (it == pending_cache_requests_.end()) {
-    ThumbnailRequest request(NULL);
+    ImageRequest request(NULL);
     request.url = url;
-    request.thumbnail_url = thumbnail_url;
+    request.image_url = image_url;
     request.callbacks.push_back(callback);
     pending_cache_requests_[url].swap(&request);
   } else {
@@ -103,16 +103,16 @@ void ThumbnailManager::QueueCacheRequest(
   }
 }
 
-void ThumbnailManager::ServeFromCacheOrNetwork(
-    const GURL& url, const GURL& thumbnail_url,
+void ImageManagerImpl::ServeFromCacheOrNetwork(
+    const GURL& url, const GURL& image_url,
     base::Callback<void(const GURL&, const SkBitmap*)> callback) {
-  // If there is a thumbnail available in memory, return it.
+  // If there is a image available in memory, return it.
   if (!ServeFromCache(url, callback)) {
-    StartOrQueueNetworkRequest(url, thumbnail_url, callback);
+    StartOrQueueNetworkRequest(url, image_url, callback);
   }
 }
 
-bool ThumbnailManager::ServeFromCache(
+bool ImageManagerImpl::ServeFromCache(
     const GURL& url,
     base::Callback<void(const GURL&, const SkBitmap*)> callback) {
   SkBitmap* bitmap = GetBitmapFromCache(url);
@@ -123,46 +123,46 @@ bool ThumbnailManager::ServeFromCache(
   return false;
 }
 
-SkBitmap* ThumbnailManager::GetBitmapFromCache(const GURL& url) {
-  ThumbnailMap::iterator thumb_iter = thumbnail_map_.find(url.spec());
-  if (thumb_iter != thumbnail_map_.end()) {
+SkBitmap* ImageManagerImpl::GetBitmapFromCache(const GURL& url) {
+  ImageMap::iterator thumb_iter = image_map_.find(url.spec());

[huangs, 2014/08/07 20:33:32]

NIT: rename |thumb_iter|.

[Mathieu, 2014/08/07 21:03:35]

Done.

+  if (thumb_iter != image_map_.end()) {
     return &thumb_iter->second;
   }
   return NULL;
 }
 
-void ThumbnailManager::StartOrQueueNetworkRequest(
-    const GURL& url, const GURL& thumbnail_url,
+void ImageManagerImpl::StartOrQueueNetworkRequest(
+    const GURL& url, const GURL& image_url,
     base::Callback<void(const GURL&, const SkBitmap*)> callback) {
-  // Before starting to fetch the thumbnail. Look for a request in progress for
-  // |thumbnail_url|, and queue if appropriate.
-  ThumbnailRequestMap::iterator it = pending_net_requests_.find(thumbnail_url);
+  // Before starting to fetch the image. Look for a request in progress for
+  // |image_url|, and queue if appropriate.
+  ImageRequestMap::iterator it = pending_net_requests_.find(image_url);
   if (it == pending_net_requests_.end()) {
-    // |thumbnail_url| is not being fetched, so create a request and initiate
+    // |image_url| is not being fetched, so create a request and initiate
     // the fetch.
-    ThumbnailRequest request(new chrome::BitmapFetcher(thumbnail_url, this));
+    ImageRequest request(new chrome::BitmapFetcher(image_url, this));
     request.url = url;
     request.callbacks.push_back(callback);
     request.fetcher->Start(
         url_request_context_, std::string(),
         net::URLRequest::CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE,
         net::LOAD_NORMAL);
-    pending_net_requests_[thumbnail_url].swap(&request);
+    pending_net_requests_[image_url].swap(&request);
   } else {
     // Request in progress. Register as an interested callback.
     it->second.callbacks.push_back(callback);
   }
 }
 
-void ThumbnailManager::OnFetchComplete(const GURL thumbnail_url,
+void ImageManagerImpl::OnFetchComplete(const GURL image_url,
                                        const SkBitmap* bitmap) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
-  ThumbnailRequestMap::iterator thumb_iter =
-      pending_net_requests_.find(thumbnail_url);
+  ImageRequestMap::iterator thumb_iter =

[huangs, 2014/08/07 20:33:32]

NIT: rename |thumb_iter|.

[Mathieu, 2014/08/07 21:03:35]

Done.

+      pending_net_requests_.find(image_url);
   DCHECK(thumb_iter != pending_net_requests_.end());
 
-  ThumbnailRequest* request = &thumb_iter->second;
+  ImageRequest* request = &thumb_iter->second;
 
   // Here |bitmap| could be NULL or a pointer to a bitmap which is owned by the
   // BitmapFetcher and which ceases to exist after this function. Pass the
@@ -173,54 +173,54 @@ void ThumbnailManager::OnFetchComplete(const GURL thumbnail_url,
   }
 
   // Save the bitmap to the in-memory model as well as the database, because it
-  // is now the freshest representation of the thumbnail.
-  // TODO(mathp): Handle null (no thumbnail found), possible deletion in DB.
-  if (bitmap) SaveThumbnail(request->url, *bitmap);
+  // is now the freshest representation of the image.
+  // TODO(mathp): Handle null (no image found), possible deletion in DB.
+  if (bitmap) SaveImage(request->url, *bitmap);
 
-  // Erase the completed ThumbnailRequest.
+  // Erase the completed ImageRequest.
   pending_net_requests_.erase(thumb_iter);
 }
 
-void ThumbnailManager::SaveThumbnail(const GURL& url, const SkBitmap& bitmap) {
-  // Update the thumbnail map.
-  thumbnail_map_.insert(std::make_pair(url.spec(), bitmap));
+void ImageManagerImpl::SaveImage(const GURL& url, const SkBitmap& bitmap) {
+  // Update the image map.
+  image_map_.insert(std::make_pair(url.spec(), bitmap));
 
   if (!database_ready_) return;
 
   // Attempt to save a JPEG representation to the database. If not successful,
   // the fetched bitmap will still be inserted in the cache, above.
   std::vector<unsigned char> encoded_data;
-  if (EncodeThumbnail(bitmap, &encoded_data)) {
+  if (EncodeImage(bitmap, &encoded_data)) {
     // Save the resulting bitmap to the database.
-    ThumbnailData data;
+    ImageData data;
     data.set_url(url.spec());
     data.set_data(std::string(encoded_data.begin(), encoded_data.end()));
-    scoped_ptr<ProtoDatabase<ThumbnailData>::KeyEntryVector> entries_to_save(
-        new ProtoDatabase<ThumbnailData>::KeyEntryVector());
+    scoped_ptr<ProtoDatabase<ImageData>::KeyEntryVector> entries_to_save(
+        new ProtoDatabase<ImageData>::KeyEntryVector());
     scoped_ptr<std::vector<std::string> > keys_to_remove(
         new std::vector<std::string>());
     entries_to_save->push_back(std::make_pair(data.url(), data));
     database_->UpdateEntries(entries_to_save.Pass(), keys_to_remove.Pass(),
-                             base::Bind(&ThumbnailManager::OnDatabaseSave,
+                             base::Bind(&ImageManagerImpl::OnDatabaseSave,
                                         weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
-void ThumbnailManager::OnDatabaseInit(bool success) {
+void ImageManagerImpl::OnDatabaseInit(bool success) {
   if (!success) {
-    DVLOG(1) << "Thumbnail database init failed.";
+    DVLOG(1) << "Image database init failed.";
     database_.reset();
     ServePendingCacheRequests();
     return;
   }
-  database_->LoadEntries(base::Bind(&ThumbnailManager::OnDatabaseLoad,
+  database_->LoadEntries(base::Bind(&ImageManagerImpl::OnDatabaseLoad,
                                     weak_ptr_factory_.GetWeakPtr()));
 }
 
-void ThumbnailManager::OnDatabaseLoad(bool success,
-                                      scoped_ptr<ThumbnailVector> entries) {
+void ImageManagerImpl::OnDatabaseLoad(bool success,
+                                      scoped_ptr<ImageDataVector> entries) {
   if (!success) {
-    DVLOG(1) << "Thumbnail database load failed.";
+    DVLOG(1) << "Image database load failed.";
     database_.reset();
     ServePendingCacheRequests();
     return;
@@ -231,42 +231,42 @@ void ThumbnailManager::OnDatabaseLoad(bool success,
   ServePendingCacheRequests();
 }
 
-void ThumbnailManager::OnDatabaseSave(bool success) {
+void ImageManagerImpl::OnDatabaseSave(bool success) {
   if (!success) {
-    DVLOG(1) << "Thumbnail database save failed.";
+    DVLOG(1) << "Image database save failed.";
     database_.reset();
     database_ready_ = false;
   }
 }
 
-void ThumbnailManager::LoadEntriesInCache(
-    scoped_ptr<ThumbnailVector> entries) {
-  for (ThumbnailVector::iterator it = entries->begin(); it != entries->end();
+void ImageManagerImpl::LoadEntriesInCache(

[huangs, 2014/08/07 20:33:32]

Unwrap.

[Mathieu, 2014/08/07 21:03:35]

Done.

+    scoped_ptr<ImageDataVector> entries) {
+  for (ImageDataVector::iterator it = entries->begin(); it != entries->end();
        ++it) {
     std::vector<unsigned char> encoded_data(it->data().begin(),
                                             it->data().end());
 
-    scoped_ptr<SkBitmap> bitmap(DecodeThumbnail(encoded_data));
+    scoped_ptr<SkBitmap> bitmap(DecodeImage(encoded_data));
     if (bitmap.get()) {
-      thumbnail_map_.insert(std::make_pair(it->url(), *bitmap));
+      image_map_.insert(std::make_pair(it->url(), *bitmap));
     }
   }
 }
 
-void ThumbnailManager::ServePendingCacheRequests() {
-  for (ThumbnailRequestMap::iterator it = pending_cache_requests_.begin();
+void ImageManagerImpl::ServePendingCacheRequests() {
+  for (ImageRequestMap::iterator it = pending_cache_requests_.begin();
        it != pending_cache_requests_.end(); ++it) {
-    const ThumbnailRequest& request = it->second;
+    const ImageRequest& request = it->second;
     for (CallbackVector::const_iterator callback_it = request.callbacks.begin();
          callback_it != request.callbacks.end(); ++callback_it) {
-      ServeFromCacheOrNetwork(request.url, request.thumbnail_url, *callback_it);
+      ServeFromCacheOrNetwork(request.url, request.image_url, *callback_it);
     }
   }
 }
 
 // static
-bool ThumbnailManager::EncodeThumbnail(const SkBitmap& bitmap,
-                                       std::vector<unsigned char>* dest) {
+bool ImageManagerImpl::EncodeImage(const SkBitmap& bitmap,
+                                   std::vector<unsigned char>* dest) {
   SkAutoLockPixels bitmap_lock(bitmap);
   if (!bitmap.readyToDraw() || bitmap.isNull()) {
     return false;