Convert //components/data_reduction_proxy from scoped_ptr to std::unique_ptr

components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc
index 6906d2e4a1c19e084b225479f64d980cbea4372f..6c40d4cbcfa4bf47f8e299519a2b254615a19c28 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc
@@ -6,12 +6,14 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
+#include <memory>

[megjablon, 2016/04/12 21:55:35]

Can be eliminated since it's in .h

[dcheng, 2016/04/12 22:38:34]

Done.

 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/histogram_tester.h"
@@ -47,12 +49,14 @@ int64_t GetListPrefInt64Value(const base::ListValue& list_update,
 class DataUsageLoadVerifier {
  public:
   DataUsageLoadVerifier(
-      scoped_ptr<std::vector<data_reduction_proxy::DataUsageBucket>> expected) {
+      std::unique_ptr<std::vector<data_reduction_proxy::DataUsageBucket>>
+          expected) {
     expected_ = std::move(expected);
   }
 
   void OnLoadDataUsage(
-      scoped_ptr<std::vector<data_reduction_proxy::DataUsageBucket>> actual) {
+      std::unique_ptr<std::vector<data_reduction_proxy::DataUsageBucket>>
+          actual) {
     EXPECT_EQ(expected_->size(), actual->size());
 
     // We are iterating through 2 vectors, |actual| and |expected|, so using an
@@ -93,7 +97,7 @@ class DataUsageLoadVerifier {
   }
 
  private:
-  scoped_ptr<std::vector<data_reduction_proxy::DataUsageBucket>> expected_;
+  std::unique_ptr<std::vector<data_reduction_proxy::DataUsageBucket>> expected_;
 };
 
 }  // namespace
@@ -464,8 +468,8 @@ class DataReductionProxyCompressionStatsTest : public testing::Test {
 
  private:
   base::MessageLoopForUI loop_;
-  scoped_ptr<DataReductionProxyTestContext> drp_test_context_;
-  scoped_ptr<DataReductionProxyCompressionStats> compression_stats_;
+  std::unique_ptr<DataReductionProxyTestContext> drp_test_context_;
+  std::unique_ptr<DataReductionProxyCompressionStats> compression_stats_;
   base::Time now_;
   base::TimeDelta now_delta_;
 };
@@ -505,7 +509,7 @@ TEST_F(DataReductionProxyCompressionStatsTest,
       base::TimeDelta::FromMinutes(kWriteDelayMinutes));
 
   base::DictionaryValue* dict = nullptr;
-  scoped_ptr<base::Value> stats_value(
+  std::unique_ptr<base::Value> stats_value(
       compression_stats()->HistoricNetworkStatsInfoToValue());
   EXPECT_TRUE(stats_value->GetAsDictionary(&dict));
   VerifyPrefs(dict);
@@ -524,7 +528,7 @@ TEST_F(DataReductionProxyCompressionStatsTest,
   const int64_t kReceivedLength = 100;
 
   base::DictionaryValue* dict = nullptr;
-  scoped_ptr<base::Value> stats_value(
+  std::unique_ptr<base::Value> stats_value(
       compression_stats()->HistoricNetworkStatsInfoToValue());
   EXPECT_TRUE(stats_value->GetAsDictionary(&dict));
   VerifyPrefs(dict);
@@ -1065,7 +1069,7 @@ TEST_F(DataReductionProxyCompressionStatsTest, RecordDataUsageSingleSite) {
   RecordDataUsage("https://www.foo.com", 1000, 1250, now);
 
   auto expected_data_usage =
-      make_scoped_ptr(new std::vector<data_reduction_proxy::DataUsageBucket>(
+      base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
           kNumExpectedBuckets));
   data_reduction_proxy::PerConnectionDataUsage* connection_usage =
       expected_data_usage->at(kNumExpectedBuckets - 1).add_connection_usage();
@@ -1095,15 +1099,15 @@ TEST_F(DataReductionProxyCompressionStatsTest, DisableDataUsageRecording) {
 
   // Data usage on disk must be deleted.
   auto expected_data_usage1 =
-      make_scoped_ptr(new std::vector<data_reduction_proxy::DataUsageBucket>(
+      base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
           kNumExpectedBuckets));
   DataUsageLoadVerifier verifier1(std::move(expected_data_usage1));
   LoadHistoricalDataUsage(base::Bind(&DataUsageLoadVerifier::OnLoadDataUsage,
                                      base::Unretained(&verifier1)));
 
   // Public API must return an empty array.
-  auto expected_data_usage2 =
-      make_scoped_ptr(new std::vector<data_reduction_proxy::DataUsageBucket>());
+  auto expected_data_usage2 = base::WrapUnique(
+      new std::vector<data_reduction_proxy::DataUsageBucket>());
   DataUsageLoadVerifier verifier2(std::move(expected_data_usage2));
   GetHistoricalDataUsage(base::Bind(&DataUsageLoadVerifier::OnLoadDataUsage,
                                     base::Unretained(&verifier2)),
@@ -1121,7 +1125,7 @@ TEST_F(DataReductionProxyCompressionStatsTest, RecordDataUsageMultipleSites) {
   RecordDataUsage("http://foobar.com", 1002, 1252, now);
 
   auto expected_data_usage =
-      make_scoped_ptr(new std::vector<data_reduction_proxy::DataUsageBucket>(
+      base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
           kNumExpectedBuckets));
   data_reduction_proxy::PerConnectionDataUsage* connection_usage =
       expected_data_usage->at(kNumExpectedBuckets - 1).add_connection_usage();
@@ -1162,7 +1166,7 @@ TEST_F(DataReductionProxyCompressionStatsTest,
   RecordDataUsage("https://bar.com", 1001, 1251, now);
 
   auto expected_data_usage =
-      make_scoped_ptr(new std::vector<data_reduction_proxy::DataUsageBucket>(
+      base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
           kNumExpectedBuckets));
   data_reduction_proxy::PerConnectionDataUsage* connection_usage =
       expected_data_usage->at(kNumExpectedBuckets - 2).add_connection_usage();
@@ -1200,7 +1204,7 @@ TEST_F(DataReductionProxyCompressionStatsTest,
   RecordDataUsage("https://www.foo.com", 1000, 1250, fifteen_mins_ago);
 
   auto expected_data_usage =
-      make_scoped_ptr(new std::vector<data_reduction_proxy::DataUsageBucket>(
+      base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
           kNumExpectedBuckets));
   data_reduction_proxy::PerConnectionDataUsage* connection_usage =
       expected_data_usage->at(kNumExpectedBuckets - 2).add_connection_usage();
@@ -1233,7 +1237,7 @@ TEST_F(DataReductionProxyCompressionStatsTest, DeleteHistoricalDataUsage) {
   base::RunLoop().RunUntilIdle();
 
   auto expected_data_usage =
-      make_scoped_ptr(new std::vector<data_reduction_proxy::DataUsageBucket>(
+      base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
           kNumExpectedBuckets));
   DataUsageLoadVerifier verifier(std::move(expected_data_usage));
 
@@ -1263,7 +1267,7 @@ TEST_F(DataReductionProxyCompressionStatsTest, DeleteBrowsingHistory) {
   ASSERT_TRUE(DataUsageMap()->empty());
 
   auto expected_data_usage =
-      make_scoped_ptr(new std::vector<data_reduction_proxy::DataUsageBucket>(
+      base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
           kNumExpectedBuckets));
   data_reduction_proxy::PerConnectionDataUsage* connection_usage =
       expected_data_usage->at(kNumExpectedBuckets - 1).add_connection_usage();
@@ -1283,7 +1287,7 @@ TEST_F(DataReductionProxyCompressionStatsTest, DeleteBrowsingHistory) {
   base::RunLoop().RunUntilIdle();
 
   expected_data_usage =
-      make_scoped_ptr(new std::vector<data_reduction_proxy::DataUsageBucket>(
+      base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
           kNumExpectedBuckets));
   DataUsageLoadVerifier verifier2(std::move(expected_data_usage));
   LoadHistoricalDataUsage(base::Bind(&DataUsageLoadVerifier::OnLoadDataUsage,