net: Put more functions from escape.h into net namespace.

chrome/browser/safe_browsing/safe_browsing_util.cc

 // Copyright (c) 2011 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/safe_browsing_util.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
+#include "base/string_util.h"
 #include "base/stringprintf.h"
-#include "base/string_util.h"
+#include "chrome/browser/google/google_util.h"
 #include "crypto/hmac.h"
 #include "crypto/sha2.h"
-#include "chrome/browser/google/google_util.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_util.h"
 #include "net/base/escape.h"
 #include "unicode/locid.h"
 
 #if defined(OS_WIN)
 #include "chrome/installer/util/browser_distribution.h"
 #endif
 
 static const int kSafeBrowsingMacDigestSize = 20;
@@ skipping 480 matching lines @@
   return !memcmp(digest, decoded_mac.data(), kSafeBrowsingMacDigestSize);
 }
 
 GURL GeneratePhishingReportUrl(const std::string& report_page,
                                const std::string& url_to_report,
                                bool is_client_side_detection) {
   icu::Locale locale = icu::Locale::getDefault();
   const char* lang = locale.getLanguage();
   if (!lang)
     lang = "en";  // fallback
-  const std::string continue_esc =
-      EscapeQueryParamValue(base::StringPrintf(kContinueUrlFormat, lang), true);
-  const std::string current_esc = EscapeQueryParamValue(url_to_report, true);
+  const std::string continue_esc = net::EscapeQueryParamValue(
+      base::StringPrintf(kContinueUrlFormat, lang), true);
+  const std::string current_esc = net::EscapeQueryParamValue(url_to_report,
+                                                             true);
 
 #if defined(OS_WIN)
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::string client_name(dist->GetSafeBrowsingName());
 #else
   std::string client_name("googlechrome");
 #endif
   if (is_client_side_detection)
     client_name.append("_csd");
 
   GURL report_url(report_page + base::StringPrintf(kReportParams,
                                                    client_name.c_str(),
                                                    continue_esc.c_str(),
                                                    current_esc.c_str()));
   return google_util::AppendGoogleLocaleParam(report_url);
 }
 
 void StringToSBFullHash(const std::string& hash_in, SBFullHash* hash_out) {
   DCHECK_EQ(static_cast<size_t>(crypto::SHA256_LENGTH), hash_in.size());
   memcpy(hash_out->full_hash, hash_in.data(), crypto::SHA256_LENGTH);
 }
 
 std::string SBFullHashToString(const SBFullHash& hash) {
   DCHECK_EQ(static_cast<size_t>(crypto::SHA256_LENGTH), sizeof(hash.full_hash));
   return std::string(hash.full_hash, sizeof(hash.full_hash));
 }
 }  // namespace safe_browsing_util