Remove ScopedVector from base::JSONValueConverter

components/domain_reliability/config_unittest.cc

 // Copyright 2014 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/domain_reliability/config.h"
 
 #include <memory>
 #include <string>
 
+#include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace domain_reliability {
 namespace {
 
 std::unique_ptr<DomainReliabilityConfig> MakeBaseConfig() {
   DomainReliabilityConfig* config = new DomainReliabilityConfig();
   config->origin = GURL("https://example/");
   config->include_subdomains = false;
-  config->collectors.push_back(new GURL("https://example/upload"));
+  config->collectors.push_back(
+      base::MakeUnique<GURL>("https://example/upload"));
   config->failure_sample_rate = 1.0;
   config->success_sample_rate = 0.0;
   EXPECT_TRUE(config->IsValid());
   return std::unique_ptr<DomainReliabilityConfig>(config);
 }
 
 std::unique_ptr<DomainReliabilityConfig> MakeSampleConfig() {
   std::unique_ptr<DomainReliabilityConfig> config(MakeBaseConfig());
-  config->path_prefixes.push_back(new std::string("/css/"));
-  config->path_prefixes.push_back(new std::string("/js/"));
+  config->path_prefixes.push_back(base::MakeUnique<std::string>("/css/"));
+  config->path_prefixes.push_back(base::MakeUnique<std::string>("/js/"));
   EXPECT_TRUE(config->IsValid());
   return config;
 }
 
 class DomainReliabilityConfigTest : public testing::Test { };
 
 TEST_F(DomainReliabilityConfigTest, IsValid) {
   std::unique_ptr<DomainReliabilityConfig> config;
 
   config = MakeSampleConfig();
   EXPECT_TRUE(config->IsValid());
 
   config = MakeSampleConfig();
   config->origin = GURL();
   EXPECT_FALSE(config->IsValid());
 
   config = MakeSampleConfig();
   config->collectors.clear();
   EXPECT_FALSE(config->IsValid());
 
   config = MakeSampleConfig();
-  delete config->collectors[0];
-  config->collectors[0] = new GURL();
+  config->collectors[0].reset(new GURL());

[Avi (use Gerrit), 2017/01/09 17:18:29]

Why not

config->collectors[0] = base::MakeUnique<GURL>();

as you're MakeUniqueifying the file?

[leonhsl(Using Gerrit), 2017/01/10 04:39:36]

Done.

   EXPECT_FALSE(config->IsValid());
 
   config = MakeSampleConfig();
   config->failure_sample_rate = 2.0;
   EXPECT_FALSE(config->IsValid());
 
   config = MakeSampleConfig();
   config->success_sample_rate = 2.0;
   EXPECT_FALSE(config->IsValid());
 }
@@ skipping 21 matching lines @@
   EXPECT_EQ(GURL("https://example/upload"), *config->collectors[0]);
   EXPECT_EQ(2u, config->path_prefixes.size());
   EXPECT_EQ("/css/", *config->path_prefixes[0]);
   EXPECT_EQ("/js/", *config->path_prefixes[1]);
   EXPECT_EQ(0.10, config->failure_sample_rate);
   EXPECT_EQ(0.01, config->success_sample_rate);
 }
 
 }  // namespace
 }  // namespace domain_reliability