Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / common / url_schemes.cc

diff --git a/src/content/common/url_schemes.cc b/src/content/common/url_schemes.cc
index 8ab7135..c65bb14 100644 (file)
--- a/src/content/common/url_schemes.cc
+++ b/src/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()) {