Index: chrome/common/content_settings_pattern.cc |
diff --git a/chrome/common/content_settings_pattern.cc b/chrome/common/content_settings_pattern.cc |
index 8feef19d195bc890245ed38f380528a697347b58..dbe70af38c7faab5e978e28f1695299e8659b267 100644 |
--- a/chrome/common/content_settings_pattern.cc |
+++ b/chrome/common/content_settings_pattern.cc |
@@ -12,11 +12,11 @@ |
#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 { |
@@ -167,7 +167,7 @@ bool ContentSettingsPattern::Builder::Canonicalize(PatternParts* parts) { |
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(); |
} |