Revert of Revert of Fix doodle verification URL.

components/search_provider_logos/google_logo_api.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/google_logo_api.h"
 
 #include "base/base64.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
-#include "net/base/url_util.h"
 
 namespace search_provider_logos {
 
 namespace {
 const char kResponsePreamble[] = ")]}'";
 }
 
 GURL GoogleAppendFingerprintToLogoURL(const GURL& logo_url,
                                       const std::string& fingerprint) {
-  return net::AppendQueryParameter(logo_url, "async", "es_dfp:" + fingerprint);
+  // Note: we can't just use net::AppendQueryParameter() because it escapes
+  // ":" to "%3A", but the server requires the colon not to be escaped.
+  // See: http://crbug.com/413845
+
+  // TODO(newt): Switch to using net::AppendQueryParameter once it no longer
+  // escapes ":"
+
+  std::string query(logo_url.query());
+  if (!query.empty())
+    query += "&";
+
+  query += "async=es_dfp:";
+  query += fingerprint;
+  GURL::Replacements replacements;
+  replacements.SetQueryStr(query);
+  return logo_url.ReplaceComponents(replacements);
 }
 
 scoped_ptr<EncodedLogo> GoogleParseLogoResponse(
     const scoped_ptr<std::string>& response,
     base::Time response_time) {
   // Google doodles are sent as JSON with a prefix. Example:
   //   )]}' {"update":{"logo":{
   //     "data": "/9j/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/...",
   //     "mime_type": "image/png",
   //     "fingerprint": "db063e32",
@@ skipping 51 matching lines @@
   } else {
     time_to_live = base::TimeDelta::FromMilliseconds(kMaxTimeToLiveMS);
     logo->metadata.can_show_after_expiration = true;
   }
   logo->metadata.expiration_time = response_time + time_to_live;
 
   return logo.Pass();
 }
 
 }  // namespace search_provider_logos