Renamed namespaces in src/url.

url_util -> url
url_parse -> url
url_canon -> url

BUG=364747
R=brettw@chromium.org, thestig@chromium.org, willchan@chromium.org

Review URL: https://codereview.chromium.org/242463002

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

2 files changed, 14 insertions, 16 deletions

diff --git a/url/third_party/mozilla/url_parse.cc b/url/third_party/mozilla/url_parse.cc
index 84a7558..6256796 100644
--- a/url/third_party/mozilla/url_parse.cc
+++ b/url/third_party/mozilla/url_parse.cc
@@ -43,7 +43,7 @@
 #include "url/url_util.h"
 #include "url/url_util_internal.h"
 
-namespace url_parse {
+namespace url {
 
 namespace {
 
@@ -376,7 +376,7 @@ void DoParseFileSystemURL(const CHAR* spec, int spec_len, Parsed* parsed) {
     return;
   }
 
-  url_parse::Component inner_scheme;
+  Component inner_scheme;
   const CHAR* inner_spec = &spec[inner_start];
   int inner_spec_len = spec_len - inner_start;
 
@@ -394,15 +394,13 @@ void DoParseFileSystemURL(const CHAR* spec, int spec_len, Parsed* parsed) {
 
   Parsed inner_parsed;
 
-  if (url_util::CompareSchemeComponent(
-      spec, inner_scheme, url_util::kFileScheme)) {
+  if (CompareSchemeComponent(spec, inner_scheme, kFileScheme)) {
     // File URLs are special.
     ParseFileURL(inner_spec, inner_spec_len, &inner_parsed);
-  } else if (url_util::CompareSchemeComponent(spec, inner_scheme,
-      url_util::kFileSystemScheme)) {
+  } else if (CompareSchemeComponent(spec, inner_scheme, kFileSystemScheme)) {
     // Filesystem URLs don't nest.
     return;
-  } else if (url_util::IsStandard(spec, inner_scheme)) {
+  } else if (IsStandard(spec, inner_scheme)) {
     // All "normal" URLs.
     DoParseStandardURL(inner_spec, inner_spec_len, &inner_parsed);
   } else {
@@ -686,7 +684,7 @@ bool DoExtractQueryKeyValue(const CHAR* spec,
     cur++;
 
   // Save the new query
-  *query = url_parse::MakeRange(cur, end);
+  *query = MakeRange(cur, end);
   return true;
 }
 
@@ -943,4 +941,4 @@ void ParseAfterScheme(const base::char16* spec,
   DoParseAfterScheme(spec, spec_len, after_scheme, parsed);
 }
 
-}  // namespace url_parse
+}  // namespace url
diff --git a/url/third_party/mozilla/url_parse.h b/url/third_party/mozilla/url_parse.h
index 9d943e5..cc3f2dd 100644
--- a/url/third_party/mozilla/url_parse.h
+++ b/url/third_party/mozilla/url_parse.h
@@ -11,7 +11,7 @@
 #include "base/strings/string16.h"
 #include "url/url_export.h"
 
-namespace url_parse {
+namespace url {
 
 // Deprecated, but WebKit/WebCore/platform/KURLGooglePrivate.h and
 // KURLGoogle.cpp still rely on this type.
@@ -69,17 +69,17 @@ inline Component MakeRange(int begin, int end) {
 //
 // Typical usage would be:
 //
-//    url_parse::Parsed parsed;
-//    url_parse::Component scheme;
-//    if (!url_parse::ExtractScheme(url, url_len, &scheme))
+//    Parsed parsed;
+//    Component scheme;
+//    if (!ExtractScheme(url, url_len, &scheme))
 //      return I_CAN_NOT_FIND_THE_SCHEME_DUDE;
 //
 //    if (IsStandardScheme(url, scheme))  // Not provided by this component
 //      url_parseParseStandardURL(url, url_len, &parsed);
 //    else if (IsFileURL(url, scheme))    // Not provided by this component
-//      url_parse::ParseFileURL(url, url_len, &parsed);
+//      ParseFileURL(url, url_len, &parsed);
 //    else
-//      url_parse::ParsePathURL(url, url_len, &parsed);
+//      ParsePathURL(url, url_len, &parsed);
 //
 struct URL_EXPORT Parsed {
   // Identifies different components.
@@ -367,6 +367,6 @@ URL_EXPORT bool ExtractQueryKeyValue(const base::char16* url,
                                      Component* key,
                                      Component* value);
 
-}  // namespace url_parse
+}  // namespace url
 
 #endif  // URL_THIRD_PARTY_MOZILLA_URL_PARSE_H_