Create DeclarativeConditionSet, DeclarativeActionSet, and DeclarativeRule templates

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

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc
index df0771dc38d8a0cb0b384b02e403dcab69a8fc60..96ce7a53869958eefe6224e243e714fe76fe86b0 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc
@@ -10,7 +10,6 @@
 #include "base/test/values_test_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"
-#include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rule.h"
 #include "chrome/common/extensions/matcher/url_matcher_constants.h"
 #include "content/public/browser/resource_request_info.h"
 #include "net/url_request/url_request_test_util.h"
@@ -75,14 +74,14 @@ TEST(WebRequestConditionTest, CreateCondition) {
   content::ResourceRequestInfo::AllocateForTesting(&match_request,
       ResourceType::MAIN_FRAME, NULL, -1, -1);
   EXPECT_TRUE(result->IsFulfilled(
-      WebRequestRule::RequestData(&match_request, ON_BEFORE_REQUEST)));
+      DeclarativeWebRequestData(&match_request, ON_BEFORE_REQUEST)));
 
   net::TestURLRequest wrong_resource_type(
       GURL("https://www.example.com"), NULL, &context);
   content::ResourceRequestInfo::AllocateForTesting(&wrong_resource_type,
       ResourceType::SUB_FRAME, NULL, -1, -1);
   EXPECT_FALSE(result->IsFulfilled(
-      WebRequestRule::RequestData(&wrong_resource_type, ON_BEFORE_REQUEST)));
+      DeclarativeWebRequestData(&wrong_resource_type, ON_BEFORE_REQUEST)));
 }
 
 TEST(WebRequestConditionTest, CreateConditionSet) {
@@ -143,7 +142,7 @@ TEST(WebRequestConditionTest, CreateConditionSet) {
   for (std::set<URLMatcherConditionSet::ID>::iterator i = url_match_ids.begin();
        i != url_match_ids.end(); ++i) {
     if (result->IsFulfilled(
-            *i, WebRequestRule::RequestData(&http_request, ON_BEFORE_REQUEST)))
+            *i, DeclarativeWebRequestData(&http_request, ON_BEFORE_REQUEST)))
       ++number_matches;
   }
   EXPECT_EQ(1, number_matches);
@@ -155,7 +154,7 @@ TEST(WebRequestConditionTest, CreateConditionSet) {
   for (std::set<URLMatcherConditionSet::ID>::iterator i = url_match_ids.begin();
        i != url_match_ids.end(); ++i) {
     if (result->IsFulfilled(
-            *i, WebRequestRule::RequestData(&https_request, ON_BEFORE_REQUEST)))
+            *i, DeclarativeWebRequestData(&https_request, ON_BEFORE_REQUEST)))
       ++number_matches;
   }
   EXPECT_EQ(1, number_matches);
@@ -168,7 +167,7 @@ TEST(WebRequestConditionTest, CreateConditionSet) {
   for (std::set<URLMatcherConditionSet::ID>::iterator i = url_match_ids.begin();
        i != url_match_ids.end(); ++i) {
     if (result->IsFulfilled(
-            *i, WebRequestRule::RequestData(
+            *i, DeclarativeWebRequestData(
                 &https_foo_request, ON_BEFORE_REQUEST)))
       ++number_matches;
   }