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 88dbe55ff448a849b07028bfef00a37aec9350f9..596bbf3c6ecfa3d519b7b01f7a2ee6e55f6eaf46 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 |
@@ -8,11 +8,13 @@ |
#include <memory> |
#include <string> |
+#include <utility> |
#include <vector> |
#include "base/json/json_reader.h" |
#include "base/macros.h" |
#include "base/memory/linked_ptr.h" |
+#include "base/memory/ptr_util.h" |
#include "base/message_loop/message_loop.h" |
#include "base/run_loop.h" |
#include "base/stl_util.h" |
@@ -101,24 +103,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(); |
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, |
+ base::MakeUnique<base::ListValue>()); |
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); |
@@ -129,6 +130,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; |
@@ -171,10 +175,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); |