Move some content url constants to /url.

chrome/common/content_settings_pattern_parser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/content_settings_pattern_parser.h"
 
 #include "base/strings/string_util.h"
 #include "chrome/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "net/base/net_util.h"
@@ skipping 155 matching lines @@
         if (!IsAsciiDigit(port[i])) {
           builder->Invalid();
           return;
         }
       }
       // TODO(markusheintz): Check port range.
       builder->WithPort(port);
     }
   } else {
     if (scheme != std::string(extensions::kExtensionScheme) &&
-        scheme != std::string(content::kFileScheme))
+        scheme != std::string(url::kFileScheme))
       builder->WithPortWildcard();
   }
 
   if (path_component.IsNonEmpty()) {
     const std::string path = pattern_spec.substr(path_component.start,
                                                  path_component.len);
     if (path.substr(1) == kPathWildcard)
       builder->WithPathWildcard();
     else
       builder->WithPath(path);
   }
 }
 
 // static
 std::string PatternParser::ToString(
     const ContentSettingsPattern::PatternParts& parts) {
   // Return the most compact form to support legacy code and legacy pattern
   // strings.
   if (parts.is_scheme_wildcard &&
       parts.has_domain_wildcard &&
       parts.host.empty() &&
       parts.is_port_wildcard)
     return "*";
 
   std::string str;
   if (!parts.is_scheme_wildcard)
     str += parts.scheme + content::kStandardSchemeSeparator;
 
-  if (parts.scheme == content::kFileScheme) {
+  if (parts.scheme == url::kFileScheme) {
     if (parts.is_path_wildcard)
       return str + kUrlPathSeparator + kPathWildcard;
     else
       return str + parts.path;
   }
 
   if (parts.has_domain_wildcard) {
     if (parts.host.empty())
       str += kHostWildcard;
     else
       str += kDomainWildcard;
   }
   str += parts.host;
 
   if (parts.scheme == std::string(extensions::kExtensionScheme)) {
     str += parts.path.empty() ? std::string(kUrlPathSeparator) : parts.path;
     return str;
   }
 
   if (!parts.is_port_wildcard) {
     str += std::string(kUrlPortSeparator) + parts.port;
   }
 
   return str;
 }
 
 }  // namespace content_settings