Implement declarativeContent API.

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc
index 1ece019e6a397c6c4e7e31d0ecc7cc457b17551c..5dca65b83e61b550b2c446c15f32fe336909ec94 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc
@@ -11,7 +11,6 @@
 #include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"
-#include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"
 #include "chrome/common/extensions/matcher/url_matcher.h"
 #include "chrome/common/extensions/matcher/url_matcher_factory.h"
 #include "net/url_request/url_request.h"
@@ -59,7 +58,7 @@ WebRequestCondition::WebRequestCondition(
 WebRequestCondition::~WebRequestCondition() {}
 
 bool WebRequestCondition::IsFulfilled(
-    const WebRequestRule::RequestData& request_data) const {
+    const DeclarativeWebRequestData& request_data) const {
   // All condition attributes must be fulfilled for a fulfilled condition.
   if (!(request_data.stage & applicable_request_stages_)) {
     // A condition that cannot be evaluated is considered as violated.
@@ -150,60 +149,4 @@ scoped_ptr<WebRequestCondition> WebRequestCondition::Create(
   return result.Pass();
 }
 
-
-//
-// WebRequestConditionSet
-//
-
-WebRequestConditionSet::WebRequestConditionSet(
-    const WebRequestConditionSet::Conditions& conditions)
-    : conditions_(conditions) {
-  for (Conditions::iterator i = conditions_.begin(); i != conditions_.end();
-       ++i) {
-    URLMatcherConditionSet::ID trigger_id =
-        (*i)->url_matcher_condition_set_id();
-    match_triggers_[trigger_id] = i->get();
-  }
-}
-
-WebRequestConditionSet::~WebRequestConditionSet() {}
-
-bool WebRequestConditionSet::IsFulfilled(
-    URLMatcherConditionSet::ID url_match,
-    const WebRequestRule::RequestData& request_data) const {
-  MatchTriggers::const_iterator trigger = match_triggers_.find(url_match);
-  DCHECK(trigger != match_triggers_.end());
-  DCHECK_EQ(url_match, trigger->second->url_matcher_condition_set_id());
-  return trigger->second->IsFulfilled(request_data);
-}
-
-void WebRequestConditionSet::GetURLMatcherConditionSets(
-    URLMatcherConditionSet::Vector* condition_sets) const {
-  for (Conditions::const_iterator i = conditions_.begin();
-       i != conditions_.end(); ++i) {
-    condition_sets->push_back((*i)->url_matcher_condition_set());
-  }
-}
-
-// static
-scoped_ptr<WebRequestConditionSet> WebRequestConditionSet::Create(
-    URLMatcherConditionFactory* url_matcher_condition_factory,
-    const AnyVector& conditions,
-    std::string* error) {
-  WebRequestConditionSet::Conditions result;
-
-  for (AnyVector::const_iterator i = conditions.begin();
-       i != conditions.end(); ++i) {
-    CHECK(i->get());
-    scoped_ptr<WebRequestCondition> condition =
-        WebRequestCondition::Create(url_matcher_condition_factory,
-                                    (*i)->value(), error);
-    if (!error->empty())
-      return scoped_ptr<WebRequestConditionSet>(NULL);
-    result.push_back(make_linked_ptr(condition.release()));
-  }
-
-  return scoped_ptr<WebRequestConditionSet>(new WebRequestConditionSet(result));
-}
-
 }  // namespace extensions