content: Move kStandardSchemeSeparator into content namespace.

chrome/common/content_settings_pattern.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.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "chrome/common/content_settings_pattern_parser.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
-#include "net/base/dns_util.h"
-#include "net/base/net_util.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_canon.h"
 #include "ipc/ipc_message_utils.h"
+#include "net/base/dns_util.h"
+#include "net/base/net_util.h"
 
 namespace {
 
 std::string GetDefaultPort(const std::string& scheme) {
   if (scheme == chrome::kHttpScheme)
     return "80";
   if (scheme == chrome::kHttpsScheme)
     return "443";
   return "";
 }
@@ skipping 130 matching lines @@
 
 // static
 bool ContentSettingsPattern::Builder::Canonicalize(PatternParts* parts) {
   // Canonicalize the scheme part.
   const std::string scheme(StringToLowerASCII(parts->scheme));
   parts->scheme = scheme;
 
   if (parts->scheme == std::string(chrome::kFileScheme) &&
       !parts->is_path_wildcard) {
       GURL url(std::string(chrome::kFileScheme) +
-               std::string(chrome::kStandardSchemeSeparator) + parts->path);
+               std::string(content::kStandardSchemeSeparator) + parts->path);
       parts->path = url.path();
   }
 
   // Canonicalize the host part.
   const std::string host(parts->host);
   url_canon::CanonHostInfo host_info;
   std::string canonicalized_host(net::CanonicalizeHost(host, &host_info));
   if (host_info.IsIPAddress() && parts->has_domain_wildcard)
     return false;
   canonicalized_host = net::TrimEndingDot(canonicalized_host);
@@ skipping 474 matching lines @@
   if (!parts.is_port_wildcard && other_parts.is_port_wildcard)
     return ContentSettingsPattern::PREDECESSOR;
 
   int result = parts.port.compare(other_parts.port);
   if (result == 0)
     return ContentSettingsPattern::IDENTITY;
   if (result > 0)
     return ContentSettingsPattern::DISJOINT_ORDER_PRE;
   return ContentSettingsPattern::DISJOINT_ORDER_POST;
 }