Index: chrome/common/extensions/url_pattern.cc |
diff --git a/chrome/common/extensions/url_pattern.cc b/chrome/common/extensions/url_pattern.cc |
index 1aae528093f7f5ecb11950bd624b5d85bd0e29a3..41a5f6e21bbba2a572520f7de1918f1de8fc7dd3 100644 |
--- a/chrome/common/extensions/url_pattern.cc |
+++ b/chrome/common/extensions/url_pattern.cc |
@@ -4,7 +4,6 @@ |
#include "chrome/common/extensions/url_pattern.h" |
-#include "base/scoped_ptr.h" |
#include "base/string_piece.h" |
#include "base/string_util.h" |
#include "chrome/common/url_constants.h" |
@@ -22,15 +21,6 @@ static const char* kValidSchemes[] = { |
static const char kPathSeparator[] = "/"; |
// static |
-URLPattern* URLPattern::CreateFromString(const std::string& pattern_string) { |
- scoped_ptr<URLPattern> pattern(new URLPattern); |
- if (pattern->Parse(pattern_string)) |
- return pattern.release(); |
- else |
- return NULL; |
-} |
- |
-// static |
bool URLPattern::IsValidScheme(const std::string& scheme) { |
for (size_t i = 0; i < arraysize(kValidSchemes); ++i) { |
if (scheme == kValidSchemes[i]) |
@@ -40,6 +30,15 @@ bool URLPattern::IsValidScheme(const std::string& scheme) { |
return false; |
} |
+URLPattern::URLPattern() |
+ : match_subdomains_(false) {} |
+ |
+URLPattern::URLPattern(const std::string& pattern) |
+ : match_subdomains_(false) { |
+ if (!Parse(pattern)) |
+ NOTREACHED() << "URLPattern is invalid: " << pattern; |
+} |
+ |
bool URLPattern::Parse(const std::string& pattern) { |
size_t scheme_end_pos = pattern.find(chrome::kStandardSchemeSeparator); |
if (scheme_end_pos == std::string::npos) |