Create DeclarativeConditionSet, DeclarativeActionSet, and DeclarativeRule templates

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

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
index ee15049410c6a5e38137160a7daa01d2500500a7..db4f6ea3ad5430b167ce0c9edbac17d3ecb5f415 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "base/message_loop.h"
 #include "base/values.h"
+#include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ -56,54 +57,6 @@ TEST(WebRequestActionTest, CreateAction) {
   EXPECT_EQ(WebRequestAction::ACTION_CANCEL_REQUEST, result->GetType());
 }
 
-TEST(WebRequestActionTest, CreateActionSet) {
-  std::string error;
-  bool bad_message = false;
-  scoped_ptr<WebRequestActionSet> result;
-
-  WebRequestActionSet::AnyVector input;
-
-  // Test empty input.
-  error.clear();
-  result = WebRequestActionSet::Create(input, &error, &bad_message);
-  EXPECT_TRUE(error.empty()) << error;
-  EXPECT_FALSE(bad_message);
-  ASSERT_TRUE(result.get());
-  EXPECT_TRUE(result->actions().empty());
-  EXPECT_EQ(std::numeric_limits<int>::min(), result->GetMinimumPriority());
-
-  DictionaryValue correct_action;
-  correct_action.SetString(keys::kInstanceTypeKey, keys::kIgnoreRulesType);
-  correct_action.SetInteger(keys::kLowerPriorityThanKey, 10);
-  DictionaryValue incorrect_action;
-  incorrect_action.SetString(keys::kInstanceTypeKey, kUnknownActionType);
-
-  // Test success.
-  linked_ptr<json_schema_compiler::any::Any> action1 = make_linked_ptr(
-      new json_schema_compiler::any::Any);
-  action1->Init(correct_action);
-  input.push_back(action1);
-  error.clear();
-  result = WebRequestActionSet::Create(input, &error, &bad_message);
-  EXPECT_TRUE(error.empty()) << error;
-  EXPECT_FALSE(bad_message);
-  ASSERT_TRUE(result.get());
-  ASSERT_EQ(1u, result->actions().size());
-  EXPECT_EQ(WebRequestAction::ACTION_IGNORE_RULES,
-            result->actions()[0]->GetType());
-  EXPECT_EQ(10, result->GetMinimumPriority());
-
-  // Test failure.
-  linked_ptr<json_schema_compiler::any::Any> action2 = make_linked_ptr(
-      new json_schema_compiler::any::Any);
-  action2->Init(incorrect_action);
-  input.push_back(action2);
-  error.clear();
-  result = WebRequestActionSet::Create(input, &error, &bad_message);
-  EXPECT_NE("", error);
-  EXPECT_FALSE(result.get());
-}
-
 // Test capture group syntax conversions of WebRequestRedirectByRegExAction
 TEST(WebRequestActionTest, PerlToRe2Style) {
 #define CallPerlToRe2Style WebRequestRedirectByRegExAction::PerlToRe2Style
@@ -147,19 +100,20 @@ TEST(WebRequestActionTest, TestPermissions) {
 
   // Check that redirect works on regular URLs but not on protected URLs.
   net::TestURLRequest regular_request(GURL("http://test.com"), NULL, &context);
-  std::list<LinkedPtrEventResponseDelta> deltas =
-      action_set->CreateDeltas(
-          NULL, "ext1",
-          WebRequestRule::RequestData(&regular_request, ON_BEFORE_REQUEST),
-          false, base::Time());
+  std::list<LinkedPtrEventResponseDelta> deltas;
+  DeclarativeWebRequestData request_data(&regular_request, ON_BEFORE_REQUEST);
+  WebRequestAction::ApplyInfo apply_info = {
+    NULL, request_data, false, &deltas
+  };
+  action_set->Apply("ext1", base::Time(), &apply_info);
   EXPECT_EQ(1u, deltas.size());
 
   net::TestURLRequest protected_request(GURL("http://clients1.google.com"),
                                         NULL, &context);
-  deltas = action_set->CreateDeltas(
-      NULL, "ext1",
-      WebRequestRule::RequestData(&protected_request, ON_BEFORE_REQUEST),
-      false, base::Time());
+  deltas.clear();
+  request_data =
+      DeclarativeWebRequestData(&protected_request, ON_BEFORE_REQUEST);
+  action_set->Apply("ext1", base::Time(), &apply_info);
   EXPECT_EQ(0u, deltas.size());
 }