Remove raw DictionaryValue::Set in //components

components/url_matcher/url_matcher_factory_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/url_matcher/url_matcher_factory.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/format_macros.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "components/url_matcher/url_matcher_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace url_matcher {
 
 namespace keys = url_matcher_constants;
 
 TEST(URLMatcherFactoryTest, CreateFromURLFilterDictionary) {
   URLMatcher matcher;
 
   std::string error;
   scoped_refptr<URLMatcherConditionSet> result;
 
   // Invalid key: {"invalid": "foobar"}
   base::DictionaryValue invalid_condition;
   invalid_condition.SetString("invalid", "foobar");
 
   // Invalid value type: {"hostSuffix": []}
   base::DictionaryValue invalid_condition2;
-  invalid_condition2.Set(keys::kHostSuffixKey, new base::ListValue);
+  invalid_condition2.Set(keys::kHostSuffixKey,
+                         base::MakeUnique<base::ListValue>());
 
   // Invalid regex value: {"urlMatches": "*"}
   base::DictionaryValue invalid_condition3;
   invalid_condition3.SetString(keys::kURLMatchesKey, "*");
 
   // Invalid regex value: {"originAndPathMatches": "*"}
   base::DictionaryValue invalid_condition4;
   invalid_condition4.SetString(keys::kOriginAndPathMatchesKey, "*");
 
   // Valid values:
   // {
   //   "port_range": [80, [1000, 1010]],
   //   "schemes": ["http"],
   //   "hostSuffix": "example.com"
   //   "hostPrefix": "www"
   // }
 
   // Port range: Allow 80;1000-1010.
-  std::unique_ptr<base::ListValue> port_range(new base::ListValue());
+  auto port_range = base::MakeUnique<base::ListValue>();
   port_range->AppendInteger(1000);
   port_range->AppendInteger(1010);
-  base::ListValue* port_ranges = new base::ListValue();
+  auto port_ranges = base::MakeUnique<base::ListValue>();
   port_ranges->AppendInteger(80);
   port_ranges->Append(std::move(port_range));
 
-  base::ListValue* scheme_list = new base::ListValue();
+  auto scheme_list = base::MakeUnique<base::ListValue>();
   scheme_list->AppendString("http");
 
   base::DictionaryValue valid_condition;
   valid_condition.SetString(keys::kHostSuffixKey, "example.com");
   valid_condition.SetString(keys::kHostPrefixKey, "www");
-  valid_condition.Set(keys::kPortsKey, port_ranges);
-  valid_condition.Set(keys::kSchemesKey, scheme_list);
+  valid_condition.Set(keys::kPortsKey, std::move(port_ranges));
+  valid_condition.Set(keys::kSchemesKey, std::move(scheme_list));
 
   // Test wrong condition name passed.
   error.clear();
   result = URLMatcherFactory::CreateFromURLFilterDictionary(
       matcher.condition_factory(), &invalid_condition, 1, &error);
   EXPECT_FALSE(error.empty());
   EXPECT_FALSE(result.get());
 
   // Test wrong datatype in hostSuffix.
   error.clear();
@@ skipping 54 matching lines @@
 
   // {"hostPrefix": "WWw."}
   base::DictionaryValue invalid_condition3;
   invalid_condition3.SetString(keys::kHostPrefixKey, "WWw.");
 
   // {"hostEquals": "WWW.example.Com"}
   base::DictionaryValue invalid_condition4;
   invalid_condition4.SetString(keys::kHostEqualsKey, "WWW.example.Com");
 
   // {"scheme": ["HTTP"]}
-  base::ListValue* scheme_list = new base::ListValue();
+  auto scheme_list = base::MakeUnique<base::ListValue>();
   scheme_list->AppendString("HTTP");
   base::DictionaryValue invalid_condition5;
-  invalid_condition5.Set(keys::kSchemesKey, scheme_list);
+  invalid_condition5.Set(keys::kSchemesKey, std::move(scheme_list));
 
   const base::DictionaryValue* invalid_conditions[] = {
     &invalid_condition1,
     &invalid_condition2,
     &invalid_condition3,
     &invalid_condition4,
     &invalid_condition5
   };
 
   for (size_t i = 0; i < arraysize(invalid_conditions); ++i) {
@@ skipping 177 matching lines @@
                          kIsUrlCaseSensitive, kIsUrlLowerCaseEnforced, url),
   };
 
   for (size_t i = 0; i < arraysize(case_tests); ++i) {
     SCOPED_TRACE(base::StringPrintf("Iteration: %" PRIuS, i));
     case_tests[i].Test();
   }
 }
 
 }  // namespace url_matcher