net: Move UnescapeURLComponent() functions into net namespace.

BUG=64263
TEST=None

R=willchan@chromium.org

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

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

4 files changed, 10 insertions, 10 deletions

diff --git a/webkit/blob/view_blob_internals_job.cc b/webkit/blob/view_blob_internals_job.cc
index b105607..1d562c5 100644
--- a/webkit/blob/view_blob_internals_job.cc
+++ b/webkit/blob/view_blob_internals_job.cc
@@ -5,13 +5,13 @@
 #include "webkit/blob/view_blob_internals_job.h"
 
 #include "base/compiler_specific.h"
-#include "base/logging.h"
 #include "base/format_macros.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
+#include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/stringprintf.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request.h"
@@ -133,7 +133,7 @@ void ViewBlobInternalsJob::DoWorkAsync() {
   if (request_->url().has_query() &&
       StartsWithASCII(request_->url().query(), "remove=", true)) {
     std::string blob_url = request_->url().query().substr(strlen("remove="));
-    blob_url = UnescapeURLComponent(blob_url,
+    blob_url = net::UnescapeURLComponent(blob_url,
         UnescapeRule::NORMAL | UnescapeRule::URL_SPECIAL_CHARS);
     blob_storage_controller_->UnregisterBlobUrl(GURL(blob_url));
   }
diff --git a/webkit/fileapi/file_system_operation.cc b/webkit/fileapi/file_system_operation.cc
index 7d2dcb0..a02e2a7 100644
--- a/webkit/fileapi/file_system_operation.cc
+++ b/webkit/fileapi/file_system_operation.cc
@@ -806,7 +806,7 @@ bool FileSystemOperation::VerifyFileSystemPathForRead(
     // On Windows, the path will look like /C:/foo/bar; we need to remove the
     // leading slash to make it valid.  But if it's empty, we shouldn't do
     // anything.
-    std::string temp = UnescapeURLComponent(path.path(),
+    std::string temp = net::UnescapeURLComponent(path.path(),
         UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS);
     if (temp.size())
       temp = temp.substr(1);
@@ -861,7 +861,7 @@ bool FileSystemOperation::VerifyFileSystemPathForWrite(
     // On Windows, the path will look like /C:/foo/bar; we need to remove the
     // leading slash to make it valid.  But if it's empty, we shouldn't do
     // anything.
-    std::string temp = UnescapeURLComponent(path.path(),
+    std::string temp = net::UnescapeURLComponent(path.path(),
         UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS);
     if (temp.size())
       temp = temp.substr(1);
diff --git a/webkit/fileapi/file_system_util.cc b/webkit/fileapi/file_system_util.cc
index 1314dfc..1e8fff4 100644
--- a/webkit/fileapi/file_system_util.cc
+++ b/webkit/fileapi/file_system_util.cc
@@ -61,7 +61,7 @@ bool CrackFileSystemURL(const GURL& url, GURL* origin_url, FileSystemType* type,
   if (origin.is_empty())
     return false;
 
-  std::string path = UnescapeURLComponent(bare_url.path(),
+  std::string path = net::UnescapeURLComponent(bare_url.path(),
       UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS |
       UnescapeRule::CONTROL_CHARS);
   if (path.compare(0, strlen(kPersistentDir), kPersistentDir) == 0) {
diff --git a/webkit/glue/ftp_directory_listing_response_delegate.cc b/webkit/glue/ftp_directory_listing_response_delegate.cc
index 33a3f8c..fc7ae59 100644
--- a/webkit/glue/ftp_directory_listing_response_delegate.cc
+++ b/webkit/glue/ftp_directory_listing_response_delegate.cc
@@ -11,8 +11,8 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
-#include "base/utf_string_conversions.h"
 #include "base/time.h"
+#include "base/utf_string_conversions.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
@@ -95,10 +95,10 @@ void FtpDirectoryListingResponseDelegate::OnCompletedRequest() {
 void FtpDirectoryListingResponseDelegate::Init(const GURL& response_url) {
   UnescapeRule::Type unescape_rules = UnescapeRule::SPACES |
                                       UnescapeRule::URL_SPECIAL_CHARS;
-  std::string unescaped_path = UnescapeURLComponent(response_url.path(),
-                                                    unescape_rules);
+  std::string unescaped_path = net::UnescapeURLComponent(response_url.path(),
+                                                         unescape_rules);
   SendDataToClient(net::GetDirectoryListingHeader(
-                       ConvertPathToUTF16(unescaped_path)));
+      ConvertPathToUTF16(unescaped_path)));
 
   // If this isn't top level directory (i.e. the path isn't "/",)
   // add a link to the parent directory.