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..41f03e7565aaccd33aa2dcd2624fc3dfad823960 100644 |
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc |
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc |
@@ -79,10 +79,7 @@ TEST(WebRequestActionTest, CreateActionSet) { |
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); |
+ input.push_back(linked_ptr<base::Value>(correct_action.DeepCopy())); |
error.clear(); |
result = WebRequestActionSet::Create(input, &error, &bad_message); |
EXPECT_TRUE(error.empty()) << error; |
@@ -94,10 +91,7 @@ TEST(WebRequestActionTest, CreateActionSet) { |
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); |
+ input.push_back(linked_ptr<base::Value>(incorrect_action.DeepCopy())); |
error.clear(); |
result = WebRequestActionSet::Create(input, &error, &bad_message); |
EXPECT_NE("", error); |
@@ -134,16 +128,12 @@ TEST(WebRequestActionTest, TestPermissions) { |
redirect.SetString(keys::kInstanceTypeKey, keys::kRedirectRequestType); |
redirect.SetString(keys::kRedirectUrlKey, "http://www.foobar.com"); |
- linked_ptr<json_schema_compiler::any::Any> action = make_linked_ptr( |
- new json_schema_compiler::any::Any); |
- action->Init(redirect); |
WebRequestActionSet::AnyVector actions; |
- actions.push_back(action); |
+ actions.push_back(linked_ptr<base::Value>(redirect.DeepCopy())); |
action_set = WebRequestActionSet::Create(actions, &error, &bad_message); |
EXPECT_EQ("", error); |
EXPECT_FALSE(bad_message); |
- ASSERT_TRUE(action.get()); |
// Check that redirect works on regular URLs but not on protected URLs. |
net::TestURLRequest regular_request(GURL("http://test.com"), NULL, &context); |