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 fbb7aa69a76b698d437c8ab2d247603236526a67..d6532f70e8a90669716947dd5be732602e3a8ebc 100644 |
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc |
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc |
@@ -58,7 +58,7 @@ scoped_ptr<WebRequestActionSet> CreateSetOfActions(const char* json) { |
bool bad_message = false; |
scoped_ptr<WebRequestActionSet> action_set( |
- WebRequestActionSet::Create(NULL, actions, &error, &bad_message)); |
+ WebRequestActionSet::Create(NULL, NULL, actions, &error, &bad_message)); |
EXPECT_EQ("", error); |
EXPECT_FALSE(bad_message); |
CHECK(action_set); |
@@ -186,28 +186,29 @@ TEST(WebRequestActionTest, CreateAction) { |
// Test wrong data type passed. |
error.clear(); |
base::ListValue empty_list; |
- result = WebRequestAction::Create(NULL, empty_list, &error, &bad_message); |
+ result = WebRequestAction::Create( |
+ NULL, NULL, empty_list, &error, &bad_message); |
EXPECT_TRUE(bad_message); |
EXPECT_FALSE(result.get()); |
// Test missing instanceType element. |
base::DictionaryValue input; |
error.clear(); |
- result = WebRequestAction::Create(NULL, input, &error, &bad_message); |
+ result = WebRequestAction::Create(NULL, NULL, input, &error, &bad_message); |
EXPECT_TRUE(bad_message); |
EXPECT_FALSE(result.get()); |
// Test wrong instanceType element. |
input.SetString(keys::kInstanceTypeKey, kUnknownActionType); |
error.clear(); |
- result = WebRequestAction::Create(NULL, input, &error, &bad_message); |
+ result = WebRequestAction::Create(NULL, NULL, input, &error, &bad_message); |
EXPECT_NE("", error); |
EXPECT_FALSE(result.get()); |
// Test success |
input.SetString(keys::kInstanceTypeKey, keys::kCancelRequestType); |
error.clear(); |
- result = WebRequestAction::Create(NULL, input, &error, &bad_message); |
+ result = WebRequestAction::Create(NULL, NULL, input, &error, &bad_message); |
EXPECT_EQ("", error); |
EXPECT_FALSE(bad_message); |
ASSERT_TRUE(result.get()); |
@@ -223,7 +224,7 @@ TEST(WebRequestActionTest, CreateActionSet) { |
// Test empty input. |
error.clear(); |
- result = WebRequestActionSet::Create(NULL, input, &error, &bad_message); |
+ result = WebRequestActionSet::Create(NULL, NULL, input, &error, &bad_message); |
EXPECT_TRUE(error.empty()) << error; |
EXPECT_FALSE(bad_message); |
ASSERT_TRUE(result.get()); |
@@ -239,7 +240,7 @@ TEST(WebRequestActionTest, CreateActionSet) { |
// Test success. |
input.push_back(linked_ptr<base::Value>(correct_action.DeepCopy())); |
error.clear(); |
- result = WebRequestActionSet::Create(NULL, input, &error, &bad_message); |
+ result = WebRequestActionSet::Create(NULL, NULL, input, &error, &bad_message); |
EXPECT_TRUE(error.empty()) << error; |
EXPECT_FALSE(bad_message); |
ASSERT_TRUE(result.get()); |
@@ -251,7 +252,7 @@ TEST(WebRequestActionTest, CreateActionSet) { |
// Test failure. |
input.push_back(linked_ptr<base::Value>(incorrect_action.DeepCopy())); |
error.clear(); |
- result = WebRequestActionSet::Create(NULL, input, &error, &bad_message); |
+ result = WebRequestActionSet::Create(NULL, NULL, input, &error, &bad_message); |
EXPECT_NE("", error); |
EXPECT_FALSE(result.get()); |
} |