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 474367a592a97c1939b4447c28e80859cce492ed..5f91741dd7084f61ed211f4b941405319e2b2010 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 |
@@ -100,24 +100,23 @@ class WebRequestRulesRegistryTest : public testing::Test { |
// Returns a rule that roughly matches http://*.example.com and |
// https://www.example.com and cancels it |
linked_ptr<api::events::Rule> CreateRule1() { |
- base::ListValue* scheme_http = new base::ListValue(); |
+ auto scheme_http = base::MakeUnique<base::ListValue>(); |
scheme_http->AppendString("http"); |
- base::DictionaryValue* http_condition_dict = new base::DictionaryValue(); |
- http_condition_dict->Set(keys2::kSchemesKey, scheme_http); |
+ auto http_condition_dict = base::MakeUnique<base::DictionaryValue>(); |
http_condition_dict->SetString(keys2::kHostSuffixKey, "example.com"); |
base::DictionaryValue http_condition_url_filter; |
- http_condition_url_filter.Set(keys::kUrlKey, http_condition_dict); |
http_condition_url_filter.SetString(keys::kInstanceTypeKey, |
keys::kRequestMatcherType); |
- base::ListValue* scheme_https = new base::ListValue(); |
+ auto scheme_https = base::MakeUnique<base::ListValue>(); |
jdoerrie
2017/04/06 14:25:50
Inline variable? This seems unused otherwise.
vabr (Chromium)
2017/04/07 20:40:40
Done.
|
scheme_http->AppendString("https"); |
- base::DictionaryValue* https_condition_dict = new base::DictionaryValue(); |
- https_condition_dict->Set(keys2::kSchemesKey, scheme_https); |
+ auto https_condition_dict = base::MakeUnique<base::DictionaryValue>(); |
+ https_condition_dict->Set(keys2::kSchemesKey, std::move(scheme_https)); |
https_condition_dict->SetString(keys2::kHostSuffixKey, "example.com"); |
https_condition_dict->SetString(keys2::kHostPrefixKey, "www"); |
base::DictionaryValue https_condition_url_filter; |
- https_condition_url_filter.Set(keys::kUrlKey, https_condition_dict); |
+ https_condition_url_filter.Set(keys::kUrlKey, |
+ std::move(https_condition_dict)); |
https_condition_url_filter.SetString(keys::kInstanceTypeKey, |
keys::kRequestMatcherType); |
@@ -128,6 +127,9 @@ class WebRequestRulesRegistryTest : public testing::Test { |
rule->id.reset(new std::string(kRuleId1)); |
rule->priority.reset(new int(100)); |
rule->actions.push_back(action_dict.CreateDeepCopy()); |
+ http_condition_dict->Set(keys2::kSchemesKey, std::move(scheme_http)); |
+ http_condition_url_filter.Set(keys::kUrlKey, |
+ std::move(http_condition_dict)); |
rule->conditions.push_back(http_condition_url_filter.CreateDeepCopy()); |
rule->conditions.push_back(https_condition_url_filter.CreateDeepCopy()); |
return rule; |
@@ -170,10 +172,10 @@ class WebRequestRulesRegistryTest : public testing::Test { |
// contains index.html. |
linked_ptr<api::events::Rule> CreateIgnoreRule() { |
base::DictionaryValue condition_dict; |
- base::DictionaryValue* http_condition_dict = new base::DictionaryValue(); |
+ auto http_condition_dict = base::MakeUnique<base::DictionaryValue>(); |
http_condition_dict->SetString(keys2::kPathContainsKey, "index.html"); |
condition_dict.SetString(keys::kInstanceTypeKey, keys::kRequestMatcherType); |
- condition_dict.Set(keys::kUrlKey, http_condition_dict); |
+ condition_dict.Set(keys::kUrlKey, std::move(http_condition_dict)); |
base::DictionaryValue action_dict; |
action_dict.SetString(keys::kInstanceTypeKey, keys::kIgnoreRulesType); |