Refactor URLBlacklistManager to use URLMatcher.

chrome/common/extensions/matcher/url_matcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/matcher/url_matcher.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
@@ skipping 241 matching lines @@
 }
 
 URLMatcherCondition URLMatcherConditionFactory::CreatePathPrefixCondition(
     const std::string& prefix) {
   return CreateCondition(URLMatcherCondition::PATH_PREFIX,
       kEndOfDomain + prefix);
 }
 
 URLMatcherCondition URLMatcherConditionFactory::CreatePathSuffixCondition(
     const std::string& suffix) {
-  return CreateCondition(URLMatcherCondition::HOST_SUFFIX, suffix + kEndOfPath);
+  return CreateCondition(URLMatcherCondition::PATH_SUFFIX, suffix + kEndOfPath);
 }
 
 URLMatcherCondition URLMatcherConditionFactory::CreatePathContainsCondition(
     const std::string& str) {
   return CreateCondition(URLMatcherCondition::PATH_CONTAINS, str);
 }
 
 URLMatcherCondition URLMatcherConditionFactory::CreatePathEqualsCondition(
     const std::string& str) {
   return CreateCondition(URLMatcherCondition::PATH_EQUALS,
@@ skipping 23 matching lines @@
 }
 
 URLMatcherCondition
     URLMatcherConditionFactory::CreateHostSuffixPathPrefixCondition(
     const std::string& host_suffix,
     const std::string& path_prefix) {
   return CreateCondition(URLMatcherCondition::HOST_SUFFIX_PATH_PREFIX,
       host_suffix + kEndOfDomain + path_prefix);
 }
 
+URLMatcherCondition
+URLMatcherConditionFactory::CreateHostEqualsPathPrefixCondition(
+    const std::string& host,
+    const std::string& path_prefix) {
+  return CreateCondition(URLMatcherCondition::HOST_EQUALS_PATH_PREFIX,
+      kBeginningOfURL + CanonicalizeHostname(host) + kEndOfDomain +
+      path_prefix);
+}
+
 std::string URLMatcherConditionFactory::CanonicalizeURLForFullSearches(
     const GURL& url) {
   return kBeginningOfURL + CanonicalizeHostname(url.host()) + url.path() +
       (url.has_query() ? "?" + url.query() : "") + kEndOfURL;
 }
 
 URLMatcherCondition URLMatcherConditionFactory::CreateURLPrefixCondition(
     const std::string& prefix) {
   return CreateCondition(URLMatcherCondition::URL_PREFIX,
       kBeginningOfURL + CanonicalizeHostname(prefix));
 }
 
 URLMatcherCondition URLMatcherConditionFactory::CreateURLSuffixCondition(
     const std::string& suffix) {
   return CreateCondition(URLMatcherCondition::URL_SUFFIX, suffix + kEndOfURL);
 }
 
 URLMatcherCondition URLMatcherConditionFactory::CreateURLContainsCondition(
     const std::string& str) {
   return CreateCondition(URLMatcherCondition::URL_CONTAINS, str);
 }
 
 URLMatcherCondition URLMatcherConditionFactory::CreateURLEqualsCondition(
     const std::string& str) {
-  return CreateCondition(URLMatcherCondition::QUERY_EQUALS,
+  return CreateCondition(URLMatcherCondition::URL_EQUALS,
       kBeginningOfURL + CanonicalizeHostname(str) + kEndOfURL);
 }
 
 void URLMatcherConditionFactory::ForgetUnusedPatterns(
       const std::set<SubstringPattern::ID>& used_patterns) {
   PatternSingletons::iterator i = pattern_singletons_.begin();
   while (i != pattern_singletons_.end()) {
     if (used_patterns.find((*i)->id()) != used_patterns.end()) {
       ++i;
     } else {
@@ skipping 329 matching lines @@
 }
 
 void URLMatcher::UpdateInternalDatastructures() {
   UpdateSubstringSetMatcher(false);
   UpdateSubstringSetMatcher(true);
   UpdateTriggers();
   UpdateConditionFactory();
 }
 
 }  // namespace extensions