| 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 f60d0e461453a9339bf3d10ca56e63c82cab7716..f21125678100bb84ee88bb88009a5bd1754c77c7 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
|
| @@ -1064,8 +1064,8 @@ TEST_F(DataReductionProxyCompressionStatsTest, RecordDataUsageSingleSite) {
|
| RecordDataUsage("https://www.foo.com", 1000, 1250, now);
|
|
|
| auto expected_data_usage =
|
| - base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
|
| - kNumExpectedBuckets));
|
| + base::MakeUnique<std::vector<data_reduction_proxy::DataUsageBucket>>(
|
| + kNumExpectedBuckets);
|
| data_reduction_proxy::PerConnectionDataUsage* connection_usage =
|
| expected_data_usage->at(kNumExpectedBuckets - 1).add_connection_usage();
|
| data_reduction_proxy::PerSiteDataUsage* site_usage =
|
| @@ -1094,15 +1094,15 @@ TEST_F(DataReductionProxyCompressionStatsTest, DisableDataUsageRecording) {
|
|
|
| // Data usage on disk must be deleted.
|
| auto expected_data_usage1 =
|
| - base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
|
| - kNumExpectedBuckets));
|
| + base::MakeUnique<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 = base::WrapUnique(
|
| - new std::vector<data_reduction_proxy::DataUsageBucket>());
|
| + auto expected_data_usage2 =
|
| + base::MakeUnique<std::vector<data_reduction_proxy::DataUsageBucket>>();
|
| DataUsageLoadVerifier verifier2(std::move(expected_data_usage2));
|
| GetHistoricalDataUsage(base::Bind(&DataUsageLoadVerifier::OnLoadDataUsage,
|
| base::Unretained(&verifier2)),
|
| @@ -1120,8 +1120,8 @@ TEST_F(DataReductionProxyCompressionStatsTest, RecordDataUsageMultipleSites) {
|
| RecordDataUsage("http://foobar.com", 1002, 1252, now);
|
|
|
| auto expected_data_usage =
|
| - base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
|
| - kNumExpectedBuckets));
|
| + base::MakeUnique<std::vector<data_reduction_proxy::DataUsageBucket>>(
|
| + kNumExpectedBuckets);
|
| data_reduction_proxy::PerConnectionDataUsage* connection_usage =
|
| expected_data_usage->at(kNumExpectedBuckets - 1).add_connection_usage();
|
| data_reduction_proxy::PerSiteDataUsage* site_usage =
|
| @@ -1161,8 +1161,8 @@ TEST_F(DataReductionProxyCompressionStatsTest,
|
| RecordDataUsage("https://bar.com", 1001, 1251, now);
|
|
|
| auto expected_data_usage =
|
| - base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
|
| - kNumExpectedBuckets));
|
| + base::MakeUnique<std::vector<data_reduction_proxy::DataUsageBucket>>(
|
| + kNumExpectedBuckets);
|
| data_reduction_proxy::PerConnectionDataUsage* connection_usage =
|
| expected_data_usage->at(kNumExpectedBuckets - 2).add_connection_usage();
|
| data_reduction_proxy::PerSiteDataUsage* site_usage =
|
| @@ -1232,8 +1232,8 @@ TEST_F(DataReductionProxyCompressionStatsTest, DeleteHistoricalDataUsage) {
|
| base::RunLoop().RunUntilIdle();
|
|
|
| auto expected_data_usage =
|
| - base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
|
| - kNumExpectedBuckets));
|
| + base::MakeUnique<std::vector<data_reduction_proxy::DataUsageBucket>>(
|
| + kNumExpectedBuckets);
|
| DataUsageLoadVerifier verifier(std::move(expected_data_usage));
|
|
|
| GetHistoricalDataUsage(base::Bind(&DataUsageLoadVerifier::OnLoadDataUsage,
|
| @@ -1262,8 +1262,8 @@ TEST_F(DataReductionProxyCompressionStatsTest, DeleteBrowsingHistory) {
|
| ASSERT_TRUE(DataUsageMap()->empty());
|
|
|
| auto expected_data_usage =
|
| - base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
|
| - kNumExpectedBuckets));
|
| + base::MakeUnique<std::vector<data_reduction_proxy::DataUsageBucket>>(
|
| + kNumExpectedBuckets);
|
| data_reduction_proxy::PerConnectionDataUsage* connection_usage =
|
| expected_data_usage->at(kNumExpectedBuckets - 1).add_connection_usage();
|
| data_reduction_proxy::PerSiteDataUsage* site_usage =
|
| @@ -1282,8 +1282,8 @@ TEST_F(DataReductionProxyCompressionStatsTest, DeleteBrowsingHistory) {
|
| base::RunLoop().RunUntilIdle();
|
|
|
| expected_data_usage =
|
| - base::WrapUnique(new std::vector<data_reduction_proxy::DataUsageBucket>(
|
| - kNumExpectedBuckets));
|
| + base::MakeUnique<std::vector<data_reduction_proxy::DataUsageBucket>>(
|
| + kNumExpectedBuckets);
|
| DataUsageLoadVerifier verifier2(std::move(expected_data_usage));
|
| LoadHistoricalDataUsage(base::Bind(&DataUsageLoadVerifier::OnLoadDataUsage,
|
| base::Unretained(&verifier2)));
|
|
|