| Index: chrome/common/content_settings_pattern_parser.cc
|
| diff --git a/chrome/common/content_settings_pattern_parser.cc b/chrome/common/content_settings_pattern_parser.cc
|
| index e98b4d50d1de78448ab1acd905dd5bf3b013c6d3..1498586ce9021631a7f78d3920c59d505f4ae783 100644
|
| --- a/chrome/common/content_settings_pattern_parser.cc
|
| +++ b/chrome/common/content_settings_pattern_parser.cc
|
| @@ -6,9 +6,9 @@
|
|
|
| #include "base/string_util.h"
|
| #include "chrome/common/url_constants.h"
|
| -#include "net/base/net_util.h"
|
| #include "googleurl/src/gurl.h"
|
| #include "googleurl/src/url_canon.h"
|
| +#include "net/base/net_util.h"
|
|
|
| namespace {
|
|
|
| @@ -69,10 +69,10 @@ void PatternParser::Parse(const std::string& pattern_spec,
|
|
|
| // Test if a scheme pattern is in the spec.
|
| current_pos = pattern_spec.find(
|
| - std::string(chrome::kStandardSchemeSeparator), start);
|
| + std::string(content::kStandardSchemeSeparator), start);
|
| if (current_pos != std::string::npos) {
|
| scheme_component = Component(start, current_pos);
|
| - start = current_pos + strlen(chrome::kStandardSchemeSeparator);
|
| + start = current_pos + strlen(content::kStandardSchemeSeparator);
|
| current_pos = start;
|
| } else {
|
| current_pos = start;
|
| @@ -199,7 +199,7 @@ std::string PatternParser::ToString(
|
|
|
| std::string str = "";
|
| if (!parts.is_scheme_wildcard)
|
| - str += parts.scheme + chrome::kStandardSchemeSeparator;
|
| + str += parts.scheme + content::kStandardSchemeSeparator;
|
|
|
| if (parts.scheme == chrome::kFileScheme) {
|
| if (parts.is_path_wildcard)
|
|
|