Move kStandardSchemeSeparator from //content to //url

This constant is used in code shared by iOS, and is general enough to be placed
in //url.

TBR=benm,yoz

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

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

4 files changed, 7 insertions, 7 deletions

diff --git a/extensions/browser/extension_error_test_util.cc b/extensions/browser/extension_error_test_util.cc
index 68d905d..de00caa 100644
--- a/extensions/browser/extension_error_test_util.cc
+++ b/extensions/browser/extension_error_test_util.cc
@@ -32,7 +32,7 @@ scoped_ptr<ExtensionError> CreateNewRuntimeError(
 
   base::string16 source =
       base::UTF8ToUTF16(std::string(kExtensionScheme) +
-                            content::kStandardSchemeSeparator +
+                            url::kStandardSchemeSeparator +
                             extension_id);
 
   return scoped_ptr<ExtensionError>(
diff --git a/extensions/common/csp_validator.cc b/extensions/common/csp_validator.cc
index 94f880e..73a508c 100644
--- a/extensions/common/csp_validator.cc
+++ b/extensions/common/csp_validator.cc
@@ -75,7 +75,7 @@ bool HasOnlySecureTokens(base::StringTokenizer& tokenizer,
         StartsWithASCII(source, "chrome://", true) ||
         StartsWithASCII(source,
                         std::string(extensions::kExtensionScheme) +
-                            content::kStandardSchemeSeparator,
+                            url::kStandardSchemeSeparator,
                         true) ||
         StartsWithASCII(source, "chrome-extension-resource:", true)) {
       continue;
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
index ada3b31..917f67d 100644
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -283,7 +283,7 @@ bool Extension::FormatPEMForFileOutput(const std::string& input,
 // static
 GURL Extension::GetBaseURLFromExtensionId(const std::string& extension_id) {
   return GURL(std::string(extensions::kExtensionScheme) +
-              content::kStandardSchemeSeparator + extension_id + "/");
+              url::kStandardSchemeSeparator + extension_id + "/");
 }
 
 bool Extension::HasAPIPermission(APIPermission::ID permission) const {
diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc
index 885eab9..c7a3711 100644
--- a/extensions/common/url_pattern.cc
+++ b/extensions/common/url_pattern.cc
@@ -161,7 +161,7 @@ URLPattern::ParseResult URLPattern::Parse(const std::string& pattern) {
   }
 
   // Parse out the scheme.
-  size_t scheme_end_pos = pattern.find(content::kStandardSchemeSeparator);
+  size_t scheme_end_pos = pattern.find(url::kStandardSchemeSeparator);
   bool has_standard_scheme_separator = true;
 
   // Some urls also use ':' alone as the scheme separator.
@@ -182,7 +182,7 @@ URLPattern::ParseResult URLPattern::Parse(const std::string& pattern) {
 
   // Advance past the scheme separator.
   scheme_end_pos +=
-      (standard_scheme ? strlen(content::kStandardSchemeSeparator) : 1);
+      (standard_scheme ? strlen(url::kStandardSchemeSeparator) : 1);
   if (scheme_end_pos >= pattern.size())
     return PARSE_ERROR_EMPTY_HOST;
 
@@ -366,7 +366,7 @@ bool URLPattern::MatchesScheme(const std::string& test) const {
 
 bool URLPattern::MatchesHost(const std::string& host) const {
   std::string test(url::kHttpScheme);
-  test += content::kStandardSchemeSeparator;
+  test += url::kStandardSchemeSeparator;
   test += host;
   test += "/";
   return MatchesHost(GURL(test));
@@ -424,7 +424,7 @@ const std::string& URLPattern::GetAsString() const {
   bool standard_scheme = IsStandardScheme(scheme_);
 
   std::string spec = scheme_ +
-      (standard_scheme ? content::kStandardSchemeSeparator : ":");
+      (standard_scheme ? url::kStandardSchemeSeparator : ":");
 
   if (scheme_ != url::kFileScheme && standard_scheme) {
     if (match_subdomains_) {