Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2653)

Unified Diff: chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

Issue 1854993002: [Extensions] Remove linked_ptr entirely from extensions generated code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
index 06cd44532732f4595436e47273002e676d92ded9..3bab5479aedc1352f859907832ed36e4f0e3c38d 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
@@ -126,11 +126,9 @@ class WebRequestRulesRegistryTest : public testing::Test {
linked_ptr<api::events::Rule> rule(new api::events::Rule);
rule->id.reset(new std::string(kRuleId1));
rule->priority.reset(new int(100));
- rule->actions.push_back(linked_ptr<base::Value>(action_dict.DeepCopy()));
- rule->conditions.push_back(
- linked_ptr<base::Value>(http_condition_url_filter.DeepCopy()));
- rule->conditions.push_back(
- linked_ptr<base::Value>(https_condition_url_filter.DeepCopy()));
+ rule->actions.push_back(action_dict.CreateDeepCopy());
+ rule->conditions.push_back(http_condition_url_filter.CreateDeepCopy());
+ rule->conditions.push_back(https_condition_url_filter.CreateDeepCopy());
return rule;
}
@@ -145,9 +143,8 @@ class WebRequestRulesRegistryTest : public testing::Test {
linked_ptr<api::events::Rule> rule(new api::events::Rule);
rule->id.reset(new std::string(kRuleId2));
rule->priority.reset(new int(100));
- rule->actions.push_back(linked_ptr<base::Value>(action_dict.DeepCopy()));
- rule->conditions.push_back(
- linked_ptr<base::Value>(condition_dict.DeepCopy()));
+ rule->actions.push_back(action_dict.CreateDeepCopy());
+ rule->conditions.push_back(condition_dict.CreateDeepCopy());
return rule;
}
@@ -163,9 +160,8 @@ class WebRequestRulesRegistryTest : public testing::Test {
linked_ptr<api::events::Rule> rule(new api::events::Rule);
rule->id.reset(new std::string(kRuleId3));
rule->priority.reset(new int(100));
- rule->actions.push_back(linked_ptr<base::Value>(action_dict.DeepCopy()));
- rule->conditions.push_back(
- linked_ptr<base::Value>(condition_dict.DeepCopy()));
+ rule->actions.push_back(action_dict.CreateDeepCopy());
+ rule->conditions.push_back(condition_dict.CreateDeepCopy());
return rule;
}
@@ -185,23 +181,21 @@ class WebRequestRulesRegistryTest : public testing::Test {
linked_ptr<api::events::Rule> rule(new api::events::Rule);
rule->id.reset(new std::string(kRuleId4));
rule->priority.reset(new int(200));
- rule->actions.push_back(linked_ptr<base::Value>(action_dict.DeepCopy()));
- rule->conditions.push_back(
- linked_ptr<base::Value>(condition_dict.DeepCopy()));
+ rule->actions.push_back(action_dict.CreateDeepCopy());
+ rule->conditions.push_back(condition_dict.CreateDeepCopy());
return rule;
}
// Create a condition with the attributes specified. An example value of
// |attributes| is: "\"resourceType\": [\"stylesheet\"], \n".
- linked_ptr<base::Value> CreateCondition(const std::string& attributes) {
+ scoped_ptr<base::Value> CreateCondition(const std::string& attributes) {
std::string json_description =
"{ \n"
" \"instanceType\": \"declarativeWebRequest.RequestMatcher\", \n";
json_description += attributes;
json_description += "}";
- return linked_ptr<base::Value>(
- base::test::ParseJson(json_description).release());
+ return base::test::ParseJson(json_description);
}
// Create a rule with the ID |rule_id| and with conditions created from the
@@ -216,7 +210,7 @@ class WebRequestRulesRegistryTest : public testing::Test {
linked_ptr<api::events::Rule> rule(new api::events::Rule);
rule->id.reset(new std::string(rule_id));
rule->priority.reset(new int(1));
- rule->actions.push_back(linked_ptr<base::Value>(action_dict.DeepCopy()));
+ rule->actions.push_back(action_dict.CreateDeepCopy());
for (std::vector<const std::string*>::const_iterator it =
attributes.begin();
it != attributes.end(); ++it)
@@ -736,7 +730,7 @@ TEST(WebRequestRulesRegistrySimpleTest, HostPermissionsChecker) {
ASSERT_TRUE(action_value);
WebRequestActionSet::Values actions;
- actions.push_back(linked_ptr<base::Value>(action_value.release()));
+ actions.push_back(std::move(action_value));
ASSERT_TRUE(actions.back().get());
std::string error;

Powered by Google App Engine
This is Rietveld 408576698