Consolidate TestURLFetcherFactory::SetFakeResponse

chrome/browser/safe_browsing/client_side_detection_service.cc

 // Copyright (c) 2012 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 "chrome/browser/safe_browsing/client_side_detection_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 349 matching lines @@
   if (!request->SerializeToString(&request_data)) {
     UMA_HISTOGRAM_COUNTS("SBClientPhishing.RequestNotSerialized", 1);
     VLOG(1) << "Unable to serialize the CSD request. Proto file changed?";
     if (!callback.is_null())
       callback.Run(GURL(request->url()), false);
     return;
   }
 
   net::URLFetcher* fetcher = net::URLFetcher::Create(
       0 /* ID used for testing */,
-      GURL(GetClientReportUrl(kClientReportPhishingUrl)),
+      GetClientReportUrl(kClientReportPhishingUrl),
       net::URLFetcher::POST, this);
 
   // Remember which callback and URL correspond to the current fetcher object.
   ClientReportInfo* info = new ClientReportInfo;
   info->callback = callback;
   info->phishing_url = GURL(request->url());
   client_phishing_reports_[fetcher] = info;
 
   fetcher->SetLoadFlags(net::LOAD_DISABLE_CACHE);
   fetcher->SetRequestContext(request_context_getter_.get());
@@ skipping 29 matching lines @@
   if (!request->SerializeToString(&request_data)) {
     UpdateEnumUMAHistogram(REPORT_FAILED_SERIALIZATION);
     DVLOG(1) << "Unable to serialize the CSD request. Proto file changed?";
     if (!callback.is_null())
       callback.Run(GURL(request->url()), GURL(request->url()), false);
     return;
   }
 
   net::URLFetcher* fetcher = net::URLFetcher::Create(
       0 /* ID used for testing */,
-      GURL(GetClientReportUrl(kClientReportMalwareUrl)),
+      GetClientReportUrl(kClientReportMalwareUrl),
       net::URLFetcher::POST, this);
 
   // Remember which callback and URL correspond to the current fetcher object.
   ClientMalwareReportInfo* info = new ClientMalwareReportInfo;
   info->callback = callback;
   info->original_url = GURL(request->url());
   client_malware_reports_[fetcher] = info;
 
   fetcher->SetLoadFlags(net::LOAD_DISABLE_CACHE);
   fetcher->SetRequestContext(request_context_getter_.get());
@@ skipping 268 matching lines @@
   }
   for (int i = 0; i < model.page_term_size(); ++i) {
     if (model.page_term(i) < 0 || model.page_term(i) > max_index) {
       return false;
     }
   }
   return true;
 }
 
 // static
-std::string ClientSideDetectionService::GetClientReportUrl(
+GURL ClientSideDetectionService::GetClientReportUrl(
     const std::string& report_url) {
-  std::string url = report_url;
+  GURL url(report_url);
   std::string api_key = google_apis::GetAPIKey();
-  if (!api_key.empty()) {
-    base::StringAppendF(&url, "?key=%s",
-                        net::EscapeQueryParamValue(api_key, true).c_str());
-  }
+  if (!api_key.empty())
+    url = url.Resolve("?key=%s" + net::EscapeQueryParamValue(api_key, true));

[mattm, 2013/09/23 21:37:00]

remove %s

[Mattias Nissler (ping if slow), 2013/09/24 08:53:29]

Oops, thanks for pointing out. Done.

+
   return url;
 }
 }  // namespace safe_browsing