Renamed namespaces in src/content.

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

BUG=364747

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

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

11 files changed, 25 insertions, 29 deletions

diff --git a/content/browser/appcache/view_appcache_internals_job.cc b/content/browser/appcache/view_appcache_internals_job.cc
index a0758ea..b6a3c3f 100644
--- a/content/browser/appcache/view_appcache_internals_job.cc
+++ b/content/browser/appcache/view_appcache_internals_job.cc
@@ -110,8 +110,7 @@ void EmitCommandAnchor(const char* label,
   query.push_back('=');
   query.append(param);
   GURL::Replacements replacements;
-  replacements.SetQuery(query.data(),
-                        url_parse::Component(0, query.length()));
+  replacements.SetQuery(query.data(), url::Component(0, query.length()));
   GURL command_url = base_url.ReplaceComponents(replacements);
   EmitAnchor(command_url.spec(), label, out);
 }
@@ -225,8 +224,7 @@ std::string FormViewEntryAnchor(const GURL& base_url,
   query.append(group_id_string);
 
   GURL::Replacements replacements;
-  replacements.SetQuery(query.data(),
-                        url_parse::Component(0, query.length()));
+  replacements.SetQuery(query.data(), url::Component(0, query.length()));
   GURL view_entry_url = base_url.ReplaceComponents(replacements);
 
   std::string anchor;
diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc
index e5d1026..bbf24e3 100644
--- a/content/browser/browser_url_handler_impl.cc
+++ b/content/browser/browser_url_handler_impl.cc
@@ -65,11 +65,10 @@ static bool ReverseViewSource(GURL* url, BrowserContext* browser_context) {
   if (url->SchemeIs(kViewSourceScheme))
     return false;
 
-  url_canon::Replacements<char> repl;
+  url::Replacements<char> repl;
   repl.SetScheme(kViewSourceScheme,
-                 url_parse::Component(0, strlen(kViewSourceScheme)));
-  repl.SetPath(url->spec().c_str(),
-      url_parse::Component(0, url->spec().size()));
+                 url::Component(0, strlen(kViewSourceScheme)));
+  repl.SetPath(url->spec().c_str(), url::Component(0, url->spec().size()));
   *url = url->ReplaceComponents(repl);
   return true;
 }
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index 91dbd43..4fa5f08 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -115,7 +115,7 @@ bool AreURLsInPageNavigation(const GURL& existing_url,
     return navigation_type == NAVIGATION_TYPE_IN_PAGE;
   }
 
-  url_canon::Replacements<char> replacements;
+  url::Replacements<char> replacements;
   replacements.ClearRef();
   return existing_url.ReplaceComponents(replacements) ==
       new_url.ReplaceComponents(replacements);
diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/content/browser/geolocation/network_location_provider_unittest.cc
index 4bd9348..c574b7a 100644
--- a/content/browser/geolocation/network_location_provider_unittest.cc
+++ b/content/browser/geolocation/network_location_provider_unittest.cc
@@ -234,7 +234,7 @@ class GeolocationNetworkProviderTest : public testing::Test {
   }
 
   static GURL UrlWithoutQuery(const GURL& url) {
-    url_canon::Replacements<char> replacements;
+    url::Replacements<char> replacements;
     replacements.ClearQuery();
     return url.ReplaceComponents(replacements);
   }
diff --git a/content/browser/histogram_internals_request_job.cc b/content/browser/histogram_internals_request_job.cc
index dc387bf..aaa7a43 100644
--- a/content/browser/histogram_internals_request_job.cc
+++ b/content/browser/histogram_internals_request_job.cc
@@ -18,10 +18,9 @@ HistogramInternalsRequestJob::HistogramInternalsRequestJob(
     net::URLRequest* request, net::NetworkDelegate* network_delegate)
     : net::URLRequestSimpleJob(request, network_delegate) {
   const std::string& spec = request->url().possibly_invalid_spec();
-  const url_parse::Parsed& parsed =
-      request->url().parsed_for_possibly_invalid_spec();
+  const url::Parsed& parsed = request->url().parsed_for_possibly_invalid_spec();
   // + 1 to skip the slash at the beginning of the path.
-  int offset = parsed.CountCharactersBefore(url_parse::Parsed::PATH, false) + 1;
+  int offset = parsed.CountCharactersBefore(url::Parsed::PATH, false) + 1;
 
   if (offset < static_cast<int>(spec.size()))
     path_.assign(spec.substr(offset));
diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc
index bcc03f9..646f4d0 100644
--- a/content/browser/site_instance_impl_unittest.cc
+++ b/content/browser/site_instance_impl_unittest.cc
@@ -92,8 +92,8 @@ class SiteInstanceTest : public testing::Test {
 
   virtual void SetUp() {
     old_browser_client_ = SetBrowserClientForTesting(&browser_client_);
-    url_util::AddStandardScheme(kPrivilegedScheme);
-    url_util::AddStandardScheme(kChromeUIScheme);
+    url::AddStandardScheme(kPrivilegedScheme);
+    url::AddStandardScheme(kChromeUIScheme);
 
     SiteInstanceImpl::set_render_process_host_factory(&rph_factory_);
   }
diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc
index f2ccafb..e751326 100644
--- a/content/browser/webui/url_data_manager_backend.cc
+++ b/content/browser/webui/url_data_manager_backend.cc
@@ -83,9 +83,9 @@ bool CheckURLIsValid(const GURL& url) {
 // path is the remaining portion after the scheme and hostname.
 void URLToRequestPath(const GURL& url, std::string* path) {
   const std::string& spec = url.possibly_invalid_spec();
-  const url_parse::Parsed& parsed = url.parsed_for_possibly_invalid_spec();
+  const url::Parsed& parsed = url.parsed_for_possibly_invalid_spec();
   // + 1 to skip the slash at the beginning of the path.
-  int offset = parsed.CountCharactersBefore(url_parse::Parsed::PATH, false) + 1;
+  int offset = parsed.CountCharactersBefore(url::Parsed::PATH, false) + 1;
 
   if (offset < static_cast<int>(spec.size()))
     path->assign(spec.substr(offset));
diff --git a/content/common/url_schemes.cc b/content/common/url_schemes.cc
index 8ab7135..c65bb14 100644
--- a/content/common/url_schemes.cc
+++ b/content/common/url_schemes.cc
@@ -20,7 +20,7 @@
 namespace {
 
 void AddStandardSchemeHelper(const std::string& scheme) {
-  url_util::AddStandardScheme(scheme.c_str());
+  url::AddStandardScheme(scheme.c_str());
 }
 
 }  // namespace
@@ -33,10 +33,10 @@ void RegisterContentSchemes(bool lock_standard_schemes) {
   GetContentClient()->AddAdditionalSchemes(&additional_standard_schemes,
                                            &additional_savable_schemes);
 
-  url_util::AddStandardScheme(kChromeDevToolsScheme);
-  url_util::AddStandardScheme(kChromeUIScheme);
-  url_util::AddStandardScheme(kGuestScheme);
-  url_util::AddStandardScheme(kMetadataScheme);
+  url::AddStandardScheme(kChromeDevToolsScheme);
+  url::AddStandardScheme(kChromeUIScheme);
+  url::AddStandardScheme(kGuestScheme);
+  url::AddStandardScheme(kMetadataScheme);
   std::for_each(additional_standard_schemes.begin(),
                 additional_standard_schemes.end(),
                 AddStandardSchemeHelper);
@@ -47,7 +47,7 @@ void RegisterContentSchemes(bool lock_standard_schemes) {
   // thread. This is really easy to mess up, so we say that all calls to
   // AddStandardScheme in Chrome must be inside this function.
   if (lock_standard_schemes)
-    url_util::LockStandardSchemes();
+    url::LockStandardSchemes();
 
   // We rely on the above lock to protect this part from being invoked twice.
   if (!additional_savable_schemes.empty()) {
diff --git a/content/renderer/npapi/webplugin_impl.cc b/content/renderer/npapi/webplugin_impl.cc
index 892309b..065571b 100644
--- a/content/renderer/npapi/webplugin_impl.cc
+++ b/content/renderer/npapi/webplugin_impl.cc
@@ -658,8 +658,8 @@ bool WebPluginImpl::IsValidUrl(const GURL& url, Referrer referrer_flag) {
     // Do url check to make sure that there are no @, ;, \ chars in between url
     // scheme and url path.
     const char* url_to_check(url.spec().data());
-    url_parse::Parsed parsed;
-    url_parse::ParseStandardURL(url_to_check, strlen(url_to_check), &parsed);
+    url::Parsed parsed;
+    url::ParseStandardURL(url_to_check, strlen(url_to_check), &parsed);
     if (parsed.path.begin <= parsed.scheme.end())
       return true;
     std::string string_to_search;
@@ -1170,8 +1170,8 @@ void WebPluginImpl::HandleURLRequestInternal(const char* url,
   // case in that the request is a javascript url and the target is "_self",
   // in which case we route the output to the plugin rather than routing it
   // to the plugin's frame.
-  bool is_javascript_url = url_util::FindAndCompareScheme(
-      url, strlen(url), "javascript", NULL);
+  bool is_javascript_url =
+      url::FindAndCompareScheme(url, strlen(url), "javascript", NULL);
   RoutingStatus routing_status = RouteToFrame(
       url, is_javascript_url, popups_allowed, method, target, buf, len,
       notify_id, referrer_flag);
diff --git a/content/renderer/pepper/url_request_info_util.cc b/content/renderer/pepper/url_request_info_util.cc
index 50e2a24..2596a09 100644
--- a/content/renderer/pepper/url_request_info_util.cc
+++ b/content/renderer/pepper/url_request_info_util.cc
@@ -186,7 +186,7 @@ bool URLRequestRequiresUniversalAccess(const URLRequestInfoData& data) {
   return data.has_custom_referrer_url ||
          data.has_custom_content_transfer_encoding ||
          data.has_custom_user_agent ||
-         url_util::FindAndCompareScheme(data.url, "javascript", NULL);
+         url::FindAndCompareScheme(data.url, "javascript", NULL);
 }
 
 }  // namespace content
diff --git a/content/test/webkit_support.cc b/content/test/webkit_support.cc
index c7df7b2..0ef980a 100644
--- a/content/test/webkit_support.cc
+++ b/content/test/webkit_support.cc
@@ -107,7 +107,7 @@ void SetUpTestEnvironmentForUnitTests() {
   // Explicitly initialize the GURL library before spawning any threads.
   // Otherwise crash may happend when different threads try to create a GURL
   // at same time.
-  url_util::Initialize();
+  url::Initialize();
   test_environment = new TestEnvironment;
 }