Index: chrome/common/content_settings_pattern.cc |
diff --git a/chrome/common/content_settings_pattern.cc b/chrome/common/content_settings_pattern.cc |
index 01860c523b134d3de76def696a4028400a73ad91..d5e971ca0a1ef6cccb37e4910bd69811acd3c392 100644 |
--- a/chrome/common/content_settings_pattern.cc |
+++ b/chrome/common/content_settings_pattern.cc |
@@ -24,7 +24,7 @@ namespace { |
std::string GetDefaultPort(const std::string& scheme) { |
if (scheme == chrome::kHttpScheme) |
return "80"; |
- if (scheme == chrome::kHttpsScheme) |
+ if (scheme == content::kHttpsScheme) |
return "443"; |
return std::string(); |
} |
@@ -244,7 +244,7 @@ bool ContentSettingsPattern::Builder::Validate(const PatternParts& parts) { |
// Test if the scheme is supported or a wildcard. |
if (!parts.is_scheme_wildcard && |
parts.scheme != std::string(chrome::kHttpScheme) && |
- parts.scheme != std::string(chrome::kHttpsScheme)) { |
+ parts.scheme != std::string(content::kHttpsScheme)) { |
return false; |
} |
return true; |
@@ -279,7 +279,7 @@ bool ContentSettingsPattern::Builder::LegacyValidate( |
// Test if the scheme is supported or a wildcard. |
if (!parts.is_scheme_wildcard && |
parts.scheme != std::string(chrome::kHttpScheme) && |
- parts.scheme != std::string(chrome::kHttpsScheme)) { |
+ parts.scheme != std::string(content::kHttpsScheme)) { |
return false; |
} |
return true; |
@@ -342,15 +342,15 @@ ContentSettingsPattern ContentSettingsPattern::FromURL( |
} else if (local_url->SchemeIs(chrome::kHttpScheme)) { |
builder->WithSchemeWildcard()->WithDomainWildcard()->WithHost( |
local_url->host()); |
- } else if (local_url->SchemeIs(chrome::kHttpsScheme)) { |
+ } else if (local_url->SchemeIs(content::kHttpsScheme)) { |
builder->WithScheme(local_url->scheme())->WithDomainWildcard()->WithHost( |
local_url->host()); |
} else { |
// Unsupported scheme |
} |
if (local_url->port().empty()) { |
- if (local_url->SchemeIs(chrome::kHttpsScheme)) |
- builder->WithPort(GetDefaultPort(chrome::kHttpsScheme)); |
+ if (local_url->SchemeIs(content::kHttpsScheme)) |
+ builder->WithPort(GetDefaultPort(content::kHttpsScheme)); |
else |
builder->WithPortWildcard(); |
} else { |