Chromium Code Reviews| Index: extensions/common/event_filter_unittest.cc |
| diff --git a/extensions/common/event_filter_unittest.cc b/extensions/common/event_filter_unittest.cc |
| index d51e16333f71da94e824163a3e67eb3cc19d495b..a41ec99182c420e8248290f29a073854ee4c8866 100644 |
| --- a/extensions/common/event_filter_unittest.cc |
| +++ b/extensions/common/event_filter_unittest.cc |
| @@ -32,22 +32,21 @@ class EventFilterUnittest : public testing::Test { |
| protected: |
| std::unique_ptr<base::Value> HostSuffixDict(const std::string& host_suffix) { |
| - std::unique_ptr<base::DictionaryValue> dict(new DictionaryValue()); |
| - dict->Set("hostSuffix", new base::Value(host_suffix)); |
| + auto dict = base::MakeUnique<DictionaryValue>(); |
| + dict->SetString("hostSuffix", host_suffix); |
| return std::unique_ptr<base::Value>(dict.release()); |
|
Devlin
2017/06/02 15:38:48
return dict directly
jdoerrie
2017/06/06 12:40:23
Done.
|
| } |
| std::unique_ptr<base::ListValue> ValueAsList( |
| std::unique_ptr<base::Value> value) { |
| - std::unique_ptr<base::ListValue> result(new base::ListValue()); |
| + auto result = base::MakeUnique<base::ListValue>(); |
| result->Append(std::move(value)); |
| return result; |
| } |
| std::unique_ptr<EventMatcher> AllURLs() { |
| - return std::unique_ptr<EventMatcher>( |
| - new EventMatcher(std::unique_ptr<DictionaryValue>(new DictionaryValue), |
| - MSG_ROUTING_NONE)); |
| + return std::unique_ptr<EventMatcher>(new EventMatcher( |
|
Devlin
2017/06/02 15:38:48
may as well base::MakeUnique<EventMatcher> while w
jdoerrie
2017/06/06 12:40:23
Done.
|
| + base::MakeUnique<base::DictionaryValue>(), MSG_ROUTING_NONE)); |
| } |
| std::unique_ptr<EventMatcher> HostSuffixMatcher( |
| @@ -57,8 +56,8 @@ class EventFilterUnittest : public testing::Test { |
| std::unique_ptr<EventMatcher> MatcherFromURLFilterList( |
| std::unique_ptr<ListValue> url_filter_list) { |
| - std::unique_ptr<DictionaryValue> filter_dict(new DictionaryValue); |
| - filter_dict->Set("url", url_filter_list.release()); |
| + auto filter_dict = base::MakeUnique<DictionaryValue>(); |
| + filter_dict->Set("url", std::move(url_filter_list)); |
| return std::unique_ptr<EventMatcher>( |
| new EventMatcher(std::move(filter_dict), MSG_ROUTING_NONE)); |
| } |