net: Move the last two Escape() functions into the net namespace.

BUG=64263
TEST=None

R=willchan@chromium.org

Review URL: http://codereview.chromium.org/8507011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109298 0039d316-1c4b-4281-b951-d872f2087c98

20 files changed, 77 insertions, 71 deletions

diff --git a/chrome/browser/chromeos/gview_request_interceptor.cc b/chrome/browser/chromeos/gview_request_interceptor.cc
index d5b7106..37bfa55 100644
--- a/chrome/browser/chromeos/gview_request_interceptor.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor.cc
@@ -110,7 +110,7 @@ net::URLRequestJob* GViewRequestInterceptor::MaybeInterceptResponse(
   // will redirect the browser to this new URL.
   if (supported_mime_types_.count(mime_type) > 0) {
     std::string url(kGViewUrlPrefix);
-    url += EscapePath(request->url().spec());
+    url += net::EscapePath(request->url().spec());
     return new net::URLRequestRedirectJob(request, GURL(url));
   }
   return NULL;
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index ad6e5db..0037e02 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -1051,9 +1051,9 @@ void NetworkMenu::ShowTabbedNetworkSettings(const Network* network) const {
   std::string page = StringPrintf(
       "%s?servicePath=%s&networkType=%d&networkName=%s",
       chrome::kInternetOptionsSubPage,
-      EscapeUrlEncodedData(network->service_path(), true).c_str(),
+      net::EscapeUrlEncodedData(network->service_path(), true).c_str(),
       network->type(),
-      EscapeUrlEncodedData(network_name, false).c_str());
+      net::EscapeUrlEncodedData(network_name, false).c_str());
   browser->ShowOptionsTab(page);
 }
 
diff --git a/chrome/browser/extensions/app_notify_channel_setup.cc b/chrome/browser/extensions/app_notify_channel_setup.cc
index 79849bf..429ea86 100644
--- a/chrome/browser/extensions/app_notify_channel_setup.cc
+++ b/chrome/browser/extensions/app_notify_channel_setup.cc
@@ -233,8 +233,8 @@ std::string AppNotifyChannelSetup::MakeOAuth2IssueTokenBody(
     const std::string& extension_id) {
   return StringPrintf(kOAuth2IssueTokenBodyFormat,
       kOAuth2IssueTokenScope,
-      EscapeUrlEncodedData(oauth_client_id, true).c_str(),
-      EscapeUrlEncodedData(extension_id, true).c_str());
+      net::EscapeUrlEncodedData(oauth_client_id, true).c_str(),
+      net::EscapeUrlEncodedData(extension_id, true).c_str());
 }
 
 // static
diff --git a/chrome/browser/extensions/file_manager_util.cc b/chrome/browser/extensions/file_manager_util.cc
index fd5da6e1..04471f4 100644
--- a/chrome/browser/extensions/file_manager_util.cc
+++ b/chrome/browser/extensions/file_manager_util.cc
@@ -228,7 +228,7 @@ GURL FileManagerUtil::GetFileBrowserUrlWithParams(
   // kChromeUIFileManagerURL could not be used since query parameters are not
   // supported for it.
   std::string url = FileManagerUtil::GetFileBrowserUrl().spec() +
-                    '?' + EscapeUrlEncodedData(json_args, false);
+                    '?' + net::EscapeUrlEncodedData(json_args, false);
   return GURL(url);
 
 }
@@ -248,7 +248,7 @@ void FileManagerUtil::ShowFullTabUrl(Profile*,
   }
 
   std::string url = chrome::kChromeUIFileManagerURL;
-  url += "#/" + EscapeUrlEncodedData(virtual_path.value(), false);
+  url += "#/" + net::EscapeUrlEncodedData(virtual_path.value(), false);
 
   UserMetrics::RecordAction(UserMetricsAction("ShowFileBrowserFullTab"));
   browser->ShowSingletonTabRespectRef(GURL(url));
@@ -262,7 +262,7 @@ void FileManagerUtil::ViewItem(const FilePath& full_path, bool enqueue) {
       ShouldBeOpenedWithPdfPlugin(ext.data())) {
     std::string path;
     path = "file://";
-    path.append(EscapeUrlEncodedData(full_path.value(), false));
+    path.append(net::EscapeUrlEncodedData(full_path.value(), false));
     if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
       bool result = BrowserThread::PostTask(
           BrowserThread::UI, FROM_HERE,
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 8a09947..38ec539 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -364,7 +364,7 @@ std::string TemplateURLRef::ReplaceSearchTermsUsingTermsData(
       input_encoding = "UTF-8";
     }
   } else {
-    encoded_terms = UTF8ToUTF16(EscapePath(UTF16ToUTF8(terms)));
+    encoded_terms = UTF8ToUTF16(net::EscapePath(UTF16ToUTF8(terms)));
     input_encoding = "UTF-8";
   }
 
diff --git a/chrome/browser/sync/engine/net/url_translator.cc b/chrome/browser/sync/engine/net/url_translator.cc
index c96c9d3..6b65bc9 100644
--- a/chrome/browser/sync/engine/net/url_translator.cc
+++ b/chrome/browser/sync/engine/net/url_translator.cc
@@ -27,7 +27,7 @@ string CgiEscapeString(const char* src) {
 }
 
 string CgiEscapeString(const string& src) {
-  return EscapeUrlEncodedData(src, true);
+  return net::EscapeUrlEncodedData(src, true);
 }
 
 // This method appends the query string to the sync server path.
diff --git a/chrome/browser/sync/glue/password_model_associator.cc b/chrome/browser/sync/glue/password_model_associator.cc
index a33f78d..18cca95 100644
--- a/chrome/browser/sync/glue/password_model_associator.cc
+++ b/chrome/browser/sync/glue/password_model_associator.cc
@@ -422,11 +422,11 @@ std::string PasswordModelAssociator::MakeTag(
     const std::string& username_value,
     const std::string& password_element,
     const std::string& signon_realm) {
-  return EscapePath(origin_url) + "|" +
-         EscapePath(username_element) + "|" +
-         EscapePath(username_value) + "|" +
-         EscapePath(password_element) + "|" +
-         EscapePath(signon_realm);
+  return net::EscapePath(origin_url) + "|" +
+         net::EscapePath(username_element) + "|" +
+         net::EscapePath(username_value) + "|" +
+         net::EscapePath(password_element) + "|" +
+         net::EscapePath(signon_realm);
 }
 
 }  // namespace browser_sync
diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc
index e6bf720..efeecaf 100644
--- a/chrome/browser/sync/syncable/syncable.cc
+++ b/chrome/browser/sync/syncable/syncable.cc
@@ -32,10 +32,10 @@
 #include "chrome/browser/sync/syncable/directory_change_delegate.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/model_type.h"
+#include "chrome/browser/sync/syncable/syncable-inl.h"
 #include "chrome/browser/sync/syncable/syncable_changes_version.h"
 #include "chrome/browser/sync/syncable/syncable_columns.h"
 #include "chrome/browser/sync/syncable/syncable_enum_conversions.h"
-#include "chrome/browser/sync/syncable/syncable-inl.h"
 #include "chrome/browser/sync/syncable/transaction_observer.h"
 #include "chrome/browser/sync/util/logging.h"
 #include "net/base/escape.h"
@@ -1916,8 +1916,8 @@ std::ostream& operator<<(std::ostream& os, const Entry& entry) {
   }
   for ( ; i < PROTO_FIELDS_END; ++i) {
     os << g_metas_columns[i].name << ": "
-       << EscapePath(
-           kernel->ref(static_cast<ProtoField>(i)).SerializeAsString())
+       << net::EscapePath(
+              kernel->ref(static_cast<ProtoField>(i)).SerializeAsString())
        << ", ";
   }
   os << "TempFlags: ";
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index a781d70..ac21d38 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -22,8 +22,8 @@
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/translate/page_translated_details.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/translate/translate_prefs.h"
+#include "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ -37,8 +37,8 @@
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_details.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/url_fetcher.h"
@@ -603,7 +603,7 @@ void TranslateManager::ReportLanguageDetectionError(TabContents* tab_contents) {
   DCHECK(!page_url.SchemeIsSecure());
   std::string report_error_url(kReportLanguageDetectionErrorURL);
   report_error_url += "?client=cr&action=langidc&u=";
-  report_error_url += EscapeUrlEncodedData(page_url.spec(), true);
+  report_error_url += net::EscapeUrlEncodedData(page_url.spec(), true);
   report_error_url += "&sl=";
 
   TranslateTabHelper* helper = TabContentsWrapper::GetCurrentWrapperForContents(
diff --git a/chrome/browser/ui/webui/bug_report_ui.cc b/chrome/browser/ui/webui/bug_report_ui.cc
index c324e2b..d9abc7e 100644
--- a/chrome/browser/ui/webui/bug_report_ui.cc
+++ b/chrome/browser/ui/webui/bug_report_ui.cc
@@ -144,7 +144,7 @@ void ShowHtmlBugReportView(Browser* browser,
 
   std::string bug_report_url = std::string(chrome::kChromeUIBugReportURL) +
       "#" + base::IntToString(browser->active_index()) +
-      "?description=" + EscapeUrlEncodedData(description_template, false) +
+      "?description=" + net::EscapeUrlEncodedData(description_template, false) +
       "&issueType=" + base::IntToString(issue_type);
   browser->ShowSingletonTab(GURL(bug_report_url));
 }
diff --git a/chrome/browser/ui/webui/fileicon_source_chromeos.cc b/chrome/browser/ui/webui/fileicon_source_chromeos.cc
index 5d873ce..f9a24d5 100644
--- a/chrome/browser/ui/webui/fileicon_source_chromeos.cc
+++ b/chrome/browser/ui/webui/fileicon_source_chromeos.cc
@@ -176,7 +176,7 @@ void GetExtensionAndQuery(const std::string& url,
                           std::string* extension,
                           std::string* query) {
   // We receive the url with chrome://fileicon/ stripped but GURL expects it.
-  const GURL gurl("chrome://fileicon/" + EscapePath(url));
+  const GURL gurl("chrome://fileicon/" + net::EscapePath(url));
   const std::string path = gurl.path();
   *extension = StringToLowerASCII(FilePath(path).Extension());
   *query = gurl.query();
diff --git a/chrome/browser/webdata/autocomplete_syncable_service.cc b/chrome/browser/webdata/autocomplete_syncable_service.cc
index ae054ca..b2b2ce7 100644
--- a/chrome/browser/webdata/autocomplete_syncable_service.cc
+++ b/chrome/browser/webdata/autocomplete_syncable_service.cc
@@ -388,5 +388,5 @@ SyncData AutocompleteSyncableService::CreateSyncData(
 std::string AutocompleteSyncableService::KeyToTag(const std::string& name,
                                                   const std::string& value) {
   std::string ns(kAutofillEntryNamespaceTag);
-  return ns + EscapePath(name) + "|" + EscapePath(value);
+  return ns + net::EscapePath(name) + "|" + net::EscapePath(value);
 }
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher.cc b/chrome/common/net/gaia/gaia_auth_fetcher.cc
index 7e79a0d..0a861e6 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher.cc
+++ b/chrome/common/net/gaia/gaia_auth_fetcher.cc
@@ -156,10 +156,12 @@ std::string GaiaAuthFetcher::MakeClientLoginBody(
     const std::string& login_token,
     const std::string& login_captcha,
     HostedAccountsSetting allow_hosted_accounts) {
-  std::string encoded_username = EscapeUrlEncodedData(username, true);
-  std::string encoded_password = EscapeUrlEncodedData(password, true);
-  std::string encoded_login_token = EscapeUrlEncodedData(login_token, true);
-  std::string encoded_login_captcha = EscapeUrlEncodedData(login_captcha, true);
+  std::string encoded_username = net::EscapeUrlEncodedData(username, true);
+  std::string encoded_password = net::EscapeUrlEncodedData(password, true);
+  std::string encoded_login_token = net::EscapeUrlEncodedData(login_token,
+                                                              true);
+  std::string encoded_login_captcha = net::EscapeUrlEncodedData(login_captcha,
+                                                                true);
 
   const char* account_type = allow_hosted_accounts == HostedAccountsAllowed ?
       kAccountTypeHostedOrGoogle :
@@ -191,8 +193,8 @@ std::string GaiaAuthFetcher::MakeIssueAuthTokenBody(
     const std::string& sid,
     const std::string& lsid,
     const char* const service) {
-  std::string encoded_sid = EscapeUrlEncodedData(sid, true);
-  std::string encoded_lsid = EscapeUrlEncodedData(lsid, true);
+  std::string encoded_sid = net::EscapeUrlEncodedData(sid, true);
+  std::string encoded_lsid = net::EscapeUrlEncodedData(lsid, true);
 
   // All tokens should be session tokens except the gaia auth token.
   bool session = true;
@@ -208,7 +210,7 @@ std::string GaiaAuthFetcher::MakeIssueAuthTokenBody(
 
 // static
 std::string GaiaAuthFetcher::MakeGetUserInfoBody(const std::string& lsid) {
-  std::string encoded_lsid = EscapeUrlEncodedData(lsid, true);
+  std::string encoded_lsid = net::EscapeUrlEncodedData(lsid, true);
   return base::StringPrintf(kGetUserInfoFormat, encoded_lsid.c_str());
 }
 
@@ -216,9 +218,10 @@ std::string GaiaAuthFetcher::MakeGetUserInfoBody(const std::string& lsid) {
 std::string GaiaAuthFetcher::MakeTokenAuthBody(const std::string& auth_token,
                                                const std::string& continue_url,
                                                const std::string& source) {
-  std::string encoded_auth_token = EscapeUrlEncodedData(auth_token, true);
-  std::string encoded_continue_url = EscapeUrlEncodedData(continue_url, true);
-  std::string encoded_source = EscapeUrlEncodedData(source, true);
+  std::string encoded_auth_token = net::EscapeUrlEncodedData(auth_token, true);
+  std::string encoded_continue_url = net::EscapeUrlEncodedData(continue_url,
+                                                               true);
+  std::string encoded_source = net::EscapeUrlEncodedData(source, true);
   return base::StringPrintf(kTokenAuthFormat,
                             encoded_auth_token.c_str(),
                             encoded_continue_url.c_str(),
@@ -230,9 +233,10 @@ std::string GaiaAuthFetcher::MakeMergeSessionBody(
     const std::string& auth_token,
     const std::string& continue_url,
     const std::string& source) {
-  std::string encoded_auth_token = EscapeUrlEncodedData(auth_token, true);
-  std::string encoded_continue_url = EscapeUrlEncodedData(continue_url, true);
-  std::string encoded_source = EscapeUrlEncodedData(source, true);
+  std::string encoded_auth_token = net::EscapeUrlEncodedData(auth_token, true);
+  std::string encoded_continue_url = net::EscapeUrlEncodedData(continue_url,
+                                                               true);
+  std::string encoded_source = net::EscapeUrlEncodedData(source, true);
   return base::StringPrintf(kMergeSessionFormat,
                             encoded_auth_token.c_str(),
                             encoded_continue_url.c_str(),
diff --git a/chrome/common/net/gaia/gaia_authenticator.cc b/chrome/common/net/gaia/gaia_authenticator.cc
index a4e34ff..3534251 100644
--- a/chrome/common/net/gaia/gaia_authenticator.cc
+++ b/chrome/common/net/gaia/gaia_authenticator.cc
@@ -146,15 +146,15 @@ bool GaiaAuthenticator::PerformGaiaRequest(const AuthParams& params,
   GURL gaia_auth_url(gaia_url_);
 
   string post_body;
-  post_body += "Email=" + EscapeUrlEncodedData(params.email, true);
-  post_body += "&Passwd=" + EscapeUrlEncodedData(params.password, true);
-  post_body += "&source=" + EscapeUrlEncodedData(user_agent_, true);
+  post_body += "Email=" + net::EscapeUrlEncodedData(params.email, true);
+  post_body += "&Passwd=" + net::EscapeUrlEncodedData(params.password, true);
+  post_body += "&source=" + net::EscapeUrlEncodedData(user_agent_, true);
   post_body += "&service=" + service_id_;
   if (!params.captcha_token.empty() && !params.captcha_value.empty()) {
     post_body += "&logintoken=" +
-                 EscapeUrlEncodedData(params.captcha_token, true);
+                 net::EscapeUrlEncodedData(params.captcha_token, true);
     post_body += "&logincaptcha=" +
-                 EscapeUrlEncodedData(params.captcha_value, true);
+                 net::EscapeUrlEncodedData(params.captcha_value, true);
   }
   post_body += "&PersistentCookie=true";
   // We set it to GOOGLE (and not HOSTED or HOSTED_OR_GOOGLE) because we only
@@ -205,7 +205,7 @@ bool GaiaAuthenticator::LookupEmail(AuthResults* results) {
 
   string post_body;
   post_body += "LSID=";
-  post_body += EscapeUrlEncodedData(results->lsid, true);
+  post_body += net::EscapeUrlEncodedData(results->lsid, true);
 
   unsigned long server_response_code;
   string message_text;
@@ -255,7 +255,7 @@ bool GaiaAuthenticator::IssueAuthToken(AuthResults* results,
 
   string post_body;
   post_body += "LSID=";
-  post_body += EscapeUrlEncodedData(results->lsid, true);
+  post_body += net::EscapeUrlEncodedData(results->lsid, true);
   post_body += "&service=" + service_id;
   post_body += "&Session=true";
 
diff --git a/chrome/common/net/gaia/gaia_oauth_client.cc b/chrome/common/net/gaia/gaia_oauth_client.cc
index 7c0bcaa..0e4a745 100644
--- a/chrome/common/net/gaia/gaia_oauth_client.cc
+++ b/chrome/common/net/gaia/gaia_oauth_client.cc
@@ -67,10 +67,11 @@ void GaiaOAuthClient::Core::GetTokensFromAuthCode(
     int max_retries,
     GaiaOAuthClient::Delegate* delegate) {
   std::string post_body =
-      "code=" + EscapeUrlEncodedData(auth_code, true) +
-      "&client_id=" + EscapeUrlEncodedData(oauth_client_info.client_id, true) +
+      "code=" + net::EscapeUrlEncodedData(auth_code, true) +
+      "&client_id=" + net::EscapeUrlEncodedData(oauth_client_info.client_id,
+                                                true) +
       "&client_secret=" +
-      EscapeUrlEncodedData(oauth_client_info.client_secret, true) +
+      net::EscapeUrlEncodedData(oauth_client_info.client_secret, true) +
       "&redirect_uri=oob&grant_type=authorization_code";
   MakeGaiaRequest(post_body, max_retries, delegate);
 }
@@ -81,10 +82,11 @@ void GaiaOAuthClient::Core::RefreshToken(
     int max_retries,
     GaiaOAuthClient::Delegate* delegate) {
   std::string post_body =
-      "refresh_token=" + EscapeUrlEncodedData(refresh_token, true) +
-      "&client_id=" + EscapeUrlEncodedData(oauth_client_info.client_id, true) +
+      "refresh_token=" + net::EscapeUrlEncodedData(refresh_token, true) +
+      "&client_id=" + net::EscapeUrlEncodedData(oauth_client_info.client_id,
+                                                true) +
       "&client_secret=" +
-      EscapeUrlEncodedData(oauth_client_info.client_secret, true) +
+      net::EscapeUrlEncodedData(oauth_client_info.client_secret, true) +
       "&grant_type=refresh_token";
   MakeGaiaRequest(post_body, max_retries, delegate);
 }
diff --git a/content/browser/tab_contents/interstitial_page.cc b/content/browser/tab_contents/interstitial_page.cc
index 005968e..112c7c1 100644
--- a/content/browser/tab_contents/interstitial_page.cc
+++ b/content/browser/tab_contents/interstitial_page.cc
@@ -219,7 +219,7 @@ void InterstitialPage::Show() {
   CreateTabContentsView();
 
   std::string data_url = "data:text/html;charset=utf-8," +
-                         EscapePath(GetHTMLContents());
+                         net::EscapePath(GetHTMLContents());
   render_view_host_->NavigateToURL(GURL(data_url));
 
   notification_registrar_.Add(this,
diff --git a/net/base/escape.cc b/net/base/escape.cc
index 830d5c2..f607a0e 100644
--- a/net/base/escape.cc
+++ b/net/base/escape.cc
@@ -249,6 +249,8 @@ static const Charmap kExternalHandlerCharmap(
 
 }  // namespace
 
+namespace net {
+
 std::string EscapePath(const std::string& path) {
   return Escape(path, kPathCharmap, false);
 }
@@ -257,8 +259,6 @@ std::string EscapeUrlEncodedData(const std::string& path, bool use_plus) {
   return Escape(path, kUrlEscape, use_plus);
 }
 
-namespace net {
-
 std::string EscapeNonASCII(const std::string& input) {
   return Escape(input, kNonASCIICharmap, false);
 }
diff --git a/net/base/escape.h b/net/base/escape.h
index 0d2684a..9720a8d 100644
--- a/net/base/escape.h
+++ b/net/base/escape.h
@@ -13,19 +13,6 @@
 #include "base/string16.h"
 #include "net/base/net_export.h"
 
-// Escaping --------------------------------------------------------------------
-
-// Escape a file.  This includes:
-// non-printable, non-7bit, and (including space)  "#%:<>?[\]^`{|}
-NET_EXPORT std::string EscapePath(const std::string& path);
-
-// Escape application/x-www-form-urlencoded content.  This includes:
-// non-printable, non-7bit, and (including space)  ?>=<;+'&%$#"![\]^`{|}
-// Space is escaped as + (if use_plus is true) and other special characters
-// as %XX (hex).
-NET_EXPORT std::string EscapeUrlEncodedData(const std::string& path,
-                                            bool use_plus);
-
 // Unescaping ------------------------------------------------------------------
 
 class UnescapeRule {
@@ -70,6 +57,19 @@ class UnescapeRule {
 
 namespace net {
 
+// Escaping --------------------------------------------------------------------
+
+// escape a file.  this includes:
+// non-printable, non-7bit, and (including space)  "#%:<>?[\]^`{|}
+NET_EXPORT std::string EscapePath(const std::string& path);
+
+// Escape application/x-www-form-urlencoded content.  This includes:
+// non-printable, non-7bit, and (including space)  ?>=<;+'&%$#"![\]^`{|}
+// Space is escaped as + (if use_plus is true) and other special characters
+// as %XX (hex).
+NET_EXPORT std::string EscapeUrlEncodedData(const std::string& path,
+                                            bool use_plus);
+
 // Escape all non-ASCII input.
 NET_EXPORT std::string EscapeNonASCII(const std::string& input);
 
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 67ee630..eca71dc 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -45,9 +45,9 @@
 #if defined(OS_WIN)
 #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h"
 #endif
+#include "v8/include/v8.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/user_agent.h"
-#include "v8/include/v8.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebData;
@@ -215,7 +215,7 @@ static std::string DumpHistoryItem(const WebHistoryItem& item,
     url.replace(0, pos + kLayoutTestsPatternSize, kFileTestPrefix);
   } else if (url.find(kDataUrlPattern) == 0) {
     // URL-escape data URLs to match results upstream.
-    std::string path = EscapePath(url.substr(kDataUrlPatternSize));
+    std::string path = net::EscapePath(url.substr(kDataUrlPatternSize));
     url.replace(kDataUrlPatternSize, url.length(), path);
   }
 
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 214c417..4d97c56 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -45,8 +45,8 @@
 #include "ui/gfx/gl/gl_surface.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/glue/media/video_renderer_impl.h"
-#include "webkit/glue/webkit_constants.h"
 #include "webkit/glue/user_agent.h"
+#include "webkit/glue/webkit_constants.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
 #include "webkit/glue/webmediaplayer_impl.h"
@@ -56,8 +56,8 @@
 #include "webkit/plugins/webplugininfo.h"
 #include "webkit/support/platform_support.h"
 #include "webkit/support/simple_database_system.h"
-#include "webkit/support/test_webplugin_page_delegate.h"
 #include "webkit/support/test_webkit_platform_support.h"
+#include "webkit/support/test_webplugin_page_delegate.h"
 #include "webkit/tools/test_shell/simple_file_system.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 
@@ -541,7 +541,7 @@ int64 GetCurrentTimeInMillisecond() {
 }
 
 std::string EscapePath(const std::string& path) {
-  return ::EscapePath(path);
+  return net::EscapePath(path);
 }
 
 std::string MakeURLErrorDescription(const WebKit::WebURLError& error) {