Revert of Revert of Fix doodle verification URL.

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 353 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 =
-      net::AppendQueryParameter(logo_url_, "async", "es_dfp:" + fingerprint);
+  GURL url_with_fp = GoogleAppendFingerprintToLogoURL(logo_url_, fingerprint);
   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");
+  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");
+  EXPECT_EQ("http://logourl.com/?a=b&async=es_dfp:cafe0", 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 262 matching lines @@
   MockLogoObserver listener2;
   listener2.ExpectFreshLogo(&logo);
   logo_tracker_->GetLogo(&listener2);
 
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace
 
 }  // namespace search_provider_logos