3 files changed, 11 insertions, 10 deletions
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
index 87e705e..412325a 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -797,9 +797,9 @@ GURL SafeBrowsingProtocolManager::SafeBrowsingHitUrl(
   }
   return GURL(base::StringPrintf("%s&evts=%s&evtd=%s&evtr=%s&evhr=%s&evtb=%d",
       url.c_str(), threat_list.c_str(),
-      EscapeQueryParamValue(malicious_url.spec(), true).c_str(),
-      EscapeQueryParamValue(page_url.spec(), true).c_str(),
-      EscapeQueryParamValue(referrer_url.spec(), true).c_str(),
+      net::EscapeQueryParamValue(malicious_url.spec(), true).c_str(),
+      net::EscapeQueryParamValue(page_url.spec(), true).c_str(),
+      net::EscapeQueryParamValue(referrer_url.spec(), true).c_str(),
       is_subresource));
 }
 
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 8ddc4ed..8396ffe 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -10,8 +10,8 @@
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
-#include "base/stringprintf.h"
 #include "base/string_number_conversions.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
@@ -497,7 +497,7 @@ void SafeBrowsingBlockingPage::CommandReceived(const std::string& cmd) {
     // We're going to take the user to Google's SafeBrowsing diagnostic page.
     std::string diagnostic =
         base::StringPrintf(kSbDiagnosticUrl,
-                           EscapeQueryParamValue(bad_url_spec, true).c_str());
+            net::EscapeQueryParamValue(bad_url_spec, true).c_str());
     GURL diagnostic_url(diagnostic);
     diagnostic_url = google_util::AppendGoogleLocaleParam(diagnostic_url);
     DCHECK(unsafe_resources_[element_index].threat_type ==
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc
index 8503913..58351f7 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_util.cc
@@ -6,11 +6,11 @@
 
 #include "base/base64.h"
 #include "base/logging.h"
-#include "base/stringprintf.h"
 #include "base/string_util.h"
+#include "base/stringprintf.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"
@@ -517,9 +517,10 @@ GURL GeneratePhishingReportUrl(const std::string& report_page,
   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();