Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Unified Diff: extensions/common/url_pattern.cc

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and address some style nits. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/common/url_pattern.cc
diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc
index 477d3ddf080f65ea762dad056e27b11622d213cc..ff8c38922e185e6d0ffe3a57fa21c14bb7b325ae 100644
--- a/extensions/common/url_pattern.cc
+++ b/extensions/common/url_pattern.cc
@@ -10,6 +10,7 @@
#include "base/strings/string_util.h"
#include "content/public/common/url_constants.h"
#include "extensions/common/constants.h"
+#include "net/base/url_constants.h"
#include "url/gurl.h"
#include "url/url_util.h"
@@ -20,13 +21,10 @@ 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,
+ net::kHttpScheme, net::kHttpsScheme,
+ content::kFileScheme, content::kFtpScheme,
+ content::kChromeUIScheme, extensions::kExtensionScheme,
+ content::kFileSystemScheme,
};
const int kValidSchemeMasks[] = {
@@ -365,7 +363,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(net::kHttpScheme);
test += content::kStandardSchemeSeparator;
test += host;
test += "/";

Powered by Google App Engine
This is Rietveld 408576698