[LogoTracker] Correct fingerprint append in async parameter.

components/search_provider_logos/logo_tracker.h

 // 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.
 
 #ifndef COMPONENTS_SEARCH_PROVIDER_LOGOS_LOGO_TRACKER_H_
 #define COMPONENTS_SEARCH_PROVIDER_LOGOS_LOGO_TRACKER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 54 matching lines @@
 };
 
 // Parses the response from the server and returns it as an EncodedLogo. Returns
 // NULL if the response is invalid.
 typedef base::Callback<
     scoped_ptr<EncodedLogo>(const scoped_ptr<std::string>& response,
                             base::Time response_time)> ParseLogoResponse;
 
 // Encodes the fingerprint of the cached logo in the logo URL. This enables the
 // server to verify whether the cached logo is up-to-date.
-typedef base::Callback<
-    GURL(const GURL& logo_url, const std::string& fingerprint)>
-    AppendFingerprintToLogoURL;
+typedef base::Callback<GURL(const GURL& logo_url,
+                            const std::string& fingerprint,
+                            bool wants_cta)> AppendQueryparamsToLogoURL;
 
 // This class provides the logo for a search provider. Logos are downloaded from
 // the search provider's logo URL and cached on disk.
 //
 // Call SetServerAPI() at least once to specify how to get the logo from the
 // server. Then call GetLogo() to trigger retrieval of the logo and receive
 // updates once the cached and/or fresh logos are available.
 class LogoTracker : public net::URLFetcherDelegate {
  public:
   // Constructs a LogoTracker with the given LogoDelegate. Takes ownership of
@@ skipping 20 matching lines @@
   ~LogoTracker() override;
 
   // Defines the server API for downloading and parsing the logo. This must be
   // called at least once before calling GetLogo().
   //
   // |logo_url| is the URL from which the logo will be downloaded. If |logo_url|
   // is different than the current logo URL, any pending LogoObservers will be
   // canceled.
   //
   // |parse_logo_response_func| is a callback that will be used to parse the
-  // server's response into a EncodedLogo object. |append_fingerprint_func| is a
-  // callback that will return the URL from which to download the logo if a
-  // cached logo with a fingerprint is already available. Note:
-  // |parse_logo_response_func| and |append_fingerprint_func| must be suitable
-  // for running multiple times, concurrently, and on multiple threads.
+  // server's response into a EncodedLogo object. |append_queryparams_func| is a
+  // callback that will return the URL from which to download the logo.
+  // |wants_cta| determines if the url should return a call to action image.
+  // Note: |parse_logo_response_func| and |append_queryparams_func| must be
+  // suitable for running multiple times, concurrently, and on multiple threads.
   void SetServerAPI(const GURL& logo_url,
                     const ParseLogoResponse& parse_logo_response_func,
-                    const AppendFingerprintToLogoURL& append_fingerprint_func);
+                    const AppendQueryparamsToLogoURL& append_queryparams_func,
+                    bool wants_cta);
 
   // Retrieves the current search provider's logo from the local cache and/or
   // over the network, and registers |observer| to be called when the cached
   // and/or fresh logos are available.
   void GetLogo(LogoObserver* observer);
 
   // Prevents |observer| from receiving future updates. This is safe to call
   // even when the observer is being notified of an update.
   void RemoveObserver(LogoObserver* observer);
 
@@ skipping 40 matching lines @@
   void OnURLFetchDownloadProgress(const net::URLFetcher* source,
                                   int64 current,
                                   int64 total) override;
 
   // The URL from which the logo is fetched.
   GURL logo_url_;
 
   // The function used to parse the logo response from the server.
   ParseLogoResponse parse_logo_response_func_;
 
-  // The function used to include the cached logo's fingerprint in the logo URL.
-  AppendFingerprintToLogoURL append_fingerprint_func_;
+  // The function used to include the cached logo's fingerprint and call to
+  // action request in the logo URL.
+  AppendQueryparamsToLogoURL append_queryparams_func_;
+
+  // If |true| request call to action in server API.
+  bool wants_cta_;
 
   // False if an asynchronous task is currently running.
   bool is_idle_;
 
   // The logo that's been read from the cache, or NULL if the cache is empty.
   // Meaningful only if is_cached_logo_valid_ is true; NULL otherwise.
   scoped_ptr<Logo> cached_logo_;
 
   // Whether the value of |cached_logo_| reflects the actual cached logo.
   // This will be false if the logo hasn't been read from the cache yet.
@@ skipping 26 matching lines @@
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
 
   base::WeakPtrFactory<LogoTracker> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LogoTracker);
 };
 
 }  // namespace search_provider_logos
 
 #endif  // COMPONENTS_SEARCH_PROVIDER_LOGOS_LOGO_TRACKER_H_