Index: extensions/common/url_pattern.cc |
diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc |
index 477d3ddf080f65ea762dad056e27b11622d213cc..6db7d6404d6442422746c3fd9386f1ae44b7954e 100644 |
--- a/extensions/common/url_pattern.cc |
+++ b/extensions/common/url_pattern.cc |
@@ -11,6 +11,7 @@ |
#include "content/public/common/url_constants.h" |
#include "extensions/common/constants.h" |
#include "url/gurl.h" |
+#include "url/url_constants.h" |
#include "url/url_util.h" |
const char URLPattern::kAllUrlsPattern[] = "<all_urls>"; |
@@ -20,13 +21,13 @@ namespace { |
// TODO(aa): What about more obscure schemes like data: and javascript: ? |
// Note: keep this array in sync with kValidSchemeMasks. |
const char* kValidSchemes[] = { |
- content::kHttpScheme, |
- content::kHttpsScheme, |
- content::kFileScheme, |
- content::kFtpScheme, |
- content::kChromeUIScheme, |
- extensions::kExtensionScheme, |
- content::kFileSystemScheme, |
+ url::kHttpScheme, |
+ url::kHttpsScheme, |
+ content::kFileScheme, |
+ content::kFtpScheme, |
+ content::kChromeUIScheme, |
+ extensions::kExtensionScheme, |
+ content::kFileSystemScheme, |
}; |
const int kValidSchemeMasks[] = { |
@@ -365,7 +366,7 @@ bool URLPattern::MatchesScheme(const std::string& test) const { |
} |
bool URLPattern::MatchesHost(const std::string& host) const { |
- std::string test(content::kHttpScheme); |
+ std::string test(url::kHttpScheme); |
test += content::kStandardSchemeSeparator; |
test += host; |
test += "/"; |