[Suggestions] Make ThumbnailManager implement ImageManager

chrome/browser/search/suggestions/suggestions_service.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/suggestions_service.h"
 
 #include <sstream>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 101 matching lines @@
       << GetExperimentParam(kSuggestionsFieldTrialCommonParamsParam) << "&"
       << GetExperimentParam(kSuggestionsFieldTrialBlacklistUrlParam) << "=";
   return blacklist_url_prefix_stream.str();
 }
 
 }  // namespace
 
 SuggestionsService::SuggestionsService(
     net::URLRequestContextGetter* url_request_context,
     scoped_ptr<SuggestionsStore> suggestions_store,
-    scoped_ptr<ThumbnailManager> thumbnail_manager,
+    scoped_ptr<ImageManager> thumbnail_manager,
     scoped_ptr<BlacklistStore> blacklist_store)
     : suggestions_store_(suggestions_store.Pass()),
       blacklist_store_(blacklist_store.Pass()),
       thumbnail_manager_(thumbnail_manager.Pass()),
       url_request_context_(url_request_context),
       blacklist_delay_sec_(kBlacklistDefaultDelaySec),
       weak_ptr_factory_(this),
       request_timeout_ms_(kDefaultRequestTimeoutMs) {
   // Obtain various parameters from Variations.
   suggestions_url_ =
@@ skipping 47 matching lines @@
 
   // Form new request.
   DCHECK(waiting_requestors_.empty());
   waiting_requestors_.push_back(callback);
   IssueRequest(suggestions_url_);
 }
 
 void SuggestionsService::GetPageThumbnail(
     const GURL& url,
     base::Callback<void(const GURL&, const SkBitmap*)> callback) {
-  thumbnail_manager_->GetPageThumbnail(url, callback);
+  thumbnail_manager_->GetImageForURL(url, callback);
 }
 
 void SuggestionsService::BlacklistURL(
     const GURL& candidate_url,
     const SuggestionsService::ResponseCallback& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   waiting_requestors_.push_back(callback);
 
   // Blacklist locally, for immediate effect.
   if (!blacklist_store_->BlacklistUrl(candidate_url)) {
@@ skipping 107 matching lines @@
   DCHECK(success);
 
   // Compute suggestions, and dispatch then to requestors. On error still
   // dispatch empty suggestions.
   SuggestionsProfile suggestions;
   if (suggestions_data.empty()) {
     LogResponseState(RESPONSE_EMPTY);
     suggestions_store_->ClearSuggestions();
   } else if (suggestions.ParseFromString(suggestions_data)) {
     LogResponseState(RESPONSE_VALID);
-    thumbnail_manager_->InitializeThumbnailMap(suggestions);
+    thumbnail_manager_->InitializeImageMap(suggestions);
     suggestions_store_->StoreSuggestions(suggestions);
   } else {
     LogResponseState(RESPONSE_INVALID);
     suggestions_store_->LoadSuggestions(&suggestions);
   }
 
   FilterAndServe(&suggestions);
   ScheduleBlacklistUpload(true);
 }
 
@@ skipping 53 matching lines @@
   if (last_request_successful) {
     blacklist_delay_sec_ = kBlacklistDefaultDelaySec;
   } else {
     int candidate_delay = blacklist_delay_sec_ * kBlacklistBackoffMultiplier;
     if (candidate_delay < kBlacklistMaxDelaySec)
       blacklist_delay_sec_ = candidate_delay;
   }
 }
 
 }  // namespace suggestions