[LogoTracker] Correct fingerprint append in async parameter.

components/search_provider_logos/logo_tracker_unittest.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 <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 299 matching lines @@
         test_clock_(new base::SimpleTestClock()),
         logo_cache_(new NiceMock<MockLogoCache>()),
         fake_url_fetcher_factory_(NULL) {
     test_clock_->SetNow(base::Time::FromJsTime(GG_INT64_C(1388686828000)));
     logo_tracker_ = new LogoTracker(
         base::FilePath(),
         base::MessageLoopProxy::current(),
         base::MessageLoopProxy::current(),
         new net::TestURLRequestContextGetter(base::MessageLoopProxy::current()),
         scoped_ptr<LogoDelegate>(new TestLogoDelegate()));
-    logo_tracker_->SetServerAPI(logo_url_,
-                                base::Bind(&GoogleParseLogoResponse),
-                                base::Bind(&GoogleAppendFingerprintToLogoURL));
+    logo_tracker_->SetServerAPI(logo_url_, base::Bind(&GoogleParseLogoResponse),
+                                base::Bind(&GoogleAppendQueryparamsToLogoURL),
+                                false);
     logo_tracker_->SetClockForTests(scoped_ptr<base::Clock>(test_clock_));
     logo_tracker_->SetLogoCacheForTests(scoped_ptr<LogoCache>(logo_cache_));
   }
 
   virtual void TearDown() {
     // logo_tracker_ owns logo_cache_, which gets destructed on the file thread
     // after logo_tracker_'s destruction. Ensure that logo_cache_ is actually
     // destructed before the test ends to make gmock happy.
     delete logo_tracker_;
     message_loop_->RunUntilIdle();
@@ skipping 43 matching lines @@
     net::HttpStatusCode response_code) {
   fake_url_fetcher_factory_.SetFakeResponse(
       logo_url_, response, response_code, request_status);
 }
 
 void LogoTrackerTest::SetServerResponseWhenFingerprint(
     const std::string& fingerprint,
     const std::string& response_when_fingerprint,
     net::URLRequestStatus::Status request_status,
     net::HttpStatusCode response_code) {
-  GURL url_with_fp = GoogleAppendFingerprintToLogoURL(logo_url_, fingerprint);
+  GURL url_with_fp =
+      GoogleAppendQueryparamsToLogoURL(logo_url_, fingerprint, false);
   fake_url_fetcher_factory_.SetFakeResponse(
       url_with_fp, response_when_fingerprint, response_code, request_status);
 }
 
 void LogoTrackerTest::GetLogo() {
   logo_tracker_->GetLogo(&observer_);
   base::RunLoop().RunUntilIdle();
 }
 
 // Tests -----------------------------------------------------------------------
 
 TEST_F(LogoTrackerTest, FingerprintURLHasColon) {
-  GURL url_with_fp = GoogleAppendFingerprintToLogoURL(
-      GURL("http://logourl.com/path"), "abc123");
+  GURL url_with_fp = GoogleAppendQueryparamsToLogoURL(
+      GURL("http://logourl.com/path"), "abc123", false);
   EXPECT_EQ("http://logourl.com/path?async=es_dfp:abc123", url_with_fp.spec());
 
-  url_with_fp = GoogleAppendFingerprintToLogoURL(
-      GURL("http://logourl.com/?a=b"), "cafe0");
+  url_with_fp = GoogleAppendQueryparamsToLogoURL(
+      GURL("http://logourl.com/?a=b"), "cafe0", false);
   EXPECT_EQ("http://logourl.com/?a=b&async=es_dfp:cafe0", url_with_fp.spec());
 }
 
+TEST_F(LogoTrackerTest, CTAURLHasComma) {
+  GURL url_with_fp = GoogleAppendQueryparamsToLogoURL(
+      GURL("http://logourl.com/path"), "abc123", true);
+  EXPECT_EQ("http://logourl.com/path?async=es_dfp:abc123,cta:1",
+            url_with_fp.spec());
+
+  url_with_fp = GoogleAppendQueryparamsToLogoURL(
+      GURL("http://logourl.com/?a=b"), "", true);
+  EXPECT_EQ("http://logourl.com/?a=b&async=cta:1", url_with_fp.spec());
+}
+
 TEST_F(LogoTrackerTest, DownloadAndCacheLogo) {
   Logo logo = GetSampleLogo(logo_url_, test_clock_->Now());
   SetServerResponse(ServerResponse(logo));
   logo_cache_->ExpectSetCachedLogo(&logo);
   observer_.ExpectFreshLogo(&logo);
   GetLogo();
 }
 
 TEST_F(LogoTrackerTest, EmptyCacheAndFailedDownload) {
   EXPECT_CALL(*logo_cache_, UpdateCachedLogoMetadata(_)).Times(0);
@@ skipping 247 matching lines @@
 
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(LogoTrackerTest, DeleteObserversWhenLogoURLChanged) {
   MockLogoObserver listener1;
   listener1.ExpectNoLogo();
   logo_tracker_->GetLogo(&listener1);
 
   logo_url_ = GURL("http://example.com/new-logo-url");
-  logo_tracker_->SetServerAPI(logo_url_,
-                              base::Bind(&GoogleParseLogoResponse),
-                              base::Bind(&GoogleAppendFingerprintToLogoURL));
+  logo_tracker_->SetServerAPI(logo_url_, base::Bind(&GoogleParseLogoResponse),
+                              base::Bind(&GoogleAppendQueryparamsToLogoURL),
+                              false);
   Logo logo = GetSampleLogo(logo_url_, test_clock_->Now());
   SetServerResponse(ServerResponse(logo));
 
   MockLogoObserver listener2;
   listener2.ExpectFreshLogo(&logo);
   logo_tracker_->GetLogo(&listener2);
 
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace
 
 }  // namespace search_provider_logos