[LogoTracker] Correct fingerprint append in async parameter.

components/search_provider_logos/logo_tracker.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 "components/search_provider_logos/logo_tracker.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "base/task_runner_util.h"
@@ skipping 71 matching lines @@
 LogoTracker::~LogoTracker() {
   ReturnToIdle();
   file_task_runner_->PostTask(
       FROM_HERE, base::Bind(&DeleteLogoCacheOnFileThread, logo_cache_));
   logo_cache_ = NULL;
 }
 
 void LogoTracker::SetServerAPI(
     const GURL& logo_url,
     const ParseLogoResponse& parse_logo_response_func,
-    const AppendFingerprintToLogoURL& append_fingerprint_func) {
+    const AppendQueryparamsToLogoURL& append_queryparams_func,
+    bool wants_cta) {
   if (logo_url == logo_url_)
     return;
 
   ReturnToIdle();
 
   logo_url_ = logo_url;
   parse_logo_response_func_ = parse_logo_response_func;
-  append_fingerprint_func_ = append_fingerprint_func;
+  append_queryparams_func_ = append_queryparams_func;
+  wants_cta_ = wants_cta;
 }
 
 void LogoTracker::GetLogo(LogoObserver* observer) {
   DCHECK(!logo_url_.is_empty());
   logo_observers_.AddObserver(observer);
 
   if (is_idle_) {
     is_idle_ = false;
     base::PostTaskAndReplyWithResult(
         file_task_runner_.get(),
@@ skipping 81 matching lines @@
                               base::Bind(&LogoCache::UpdateCachedLogoMetadata,
                                          base::Unretained(logo_cache_),
                                          metadata));
 }
 
 void LogoTracker::FetchLogo() {
   DCHECK(!fetcher_);
   DCHECK(!is_idle_);
 
   GURL url;
+  std::string fingerprint;
   if (cached_logo_ && !cached_logo_->metadata.fingerprint.empty() &&
       cached_logo_->metadata.expiration_time >= clock_->Now()) {
-    url = append_fingerprint_func_.Run(logo_url_,
-                                       cached_logo_->metadata.fingerprint);
-  } else {
-    url = logo_url_;
+    fingerprint = cached_logo_->metadata.fingerprint;
   }
+  url = append_queryparams_func_.Run(logo_url_, fingerprint, wants_cta_);
 
   fetcher_.reset(net::URLFetcher::Create(url, net::URLFetcher::GET, this));
   fetcher_->SetRequestContext(request_context_getter_.get());
   fetcher_->Start();
 }
 
 void LogoTracker::OnFreshLogoParsed(scoped_ptr<EncodedLogo> logo) {
   DCHECK(!is_idle_);
 
   if (logo)
@@ skipping 74 matching lines @@
 void LogoTracker::OnURLFetchDownloadProgress(const net::URLFetcher* source,
                                              int64 current,
                                              int64 total) {
   if (total > kMaxDownloadBytes || current > kMaxDownloadBytes) {
     LOG(WARNING) << "Search provider logo exceeded download size limit";
     ReturnToIdle();
   }
 }
 
 }  // namespace search_provider_logos