Re-write many calls to WrapUnique() with MakeUnique()

chrome/browser/browsing_data/browsing_data_remover_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/browsing_data/browsing_data_remover.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <list>
@@ skipping 499 matching lines @@
     ssl_config_service_->RemoveObserver(this);
   }
 
   int ChannelIDCount() { return channel_id_service_->channel_id_count(); }
 
   // Add a server bound cert for |server| with specific creation and expiry
   // times.  The cert and key data will be filled with dummy values.
   void AddChannelIDWithTimes(const std::string& server_identifier,
                              base::Time creation_time) {
     GetChannelIDStore()->SetChannelID(
-        base::WrapUnique(new net::ChannelIDStore::ChannelID(
-            server_identifier, creation_time, crypto::ECPrivateKey::Create())));
+        base::MakeUnique<net::ChannelIDStore::ChannelID>(
+            server_identifier, creation_time, crypto::ECPrivateKey::Create()));
   }
 
   // Add a server bound cert for |server|, with the current time as the
   // creation time.  The cert and key data will be filled with dummy values.
   void AddChannelID(const std::string& server_identifier) {
     base::Time now = base::Time::Now();
     AddChannelIDWithTimes(server_identifier, now);
   }
 
   void GetChannelIDList(net::ChannelIDStore::ChannelIDList* channel_ids) {
@@ skipping 2050 matching lines @@
                                     BrowsingDataRemover::REMOVE_PASSWORDS,
                                 false);
 }
 
 TEST_F(BrowsingDataRemoverTest, RemoveContentSettingsWithBlacklist) {
   // Add our settings.
   HostContentSettingsMap* host_content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(GetProfile());
   host_content_settings_map->SetWebsiteSettingDefaultScope(
       kOrigin1, GURL(), CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, std::string(),
-      base::WrapUnique(new base::DictionaryValue()));
+      base::MakeUnique<base::DictionaryValue>());
   host_content_settings_map->SetWebsiteSettingDefaultScope(
       kOrigin2, GURL(), CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, std::string(),
-      base::WrapUnique(new base::DictionaryValue()));
+      base::MakeUnique<base::DictionaryValue>());
   host_content_settings_map->SetWebsiteSettingDefaultScope(
       kOrigin3, GURL(), CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, std::string(),
-      base::WrapUnique(new base::DictionaryValue()));
+      base::MakeUnique<base::DictionaryValue>());
   host_content_settings_map->SetWebsiteSettingDefaultScope(
       kOrigin4, GURL(), CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, std::string(),
-      base::WrapUnique(new base::DictionaryValue()));
+      base::MakeUnique<base::DictionaryValue>());
 
   // Clear all except for origin1 and origin3.
   RegistrableDomainFilterBuilder filter(
       RegistrableDomainFilterBuilder::BLACKLIST);
   filter.AddRegisterableDomain(kTestRegisterableDomain1);
   filter.AddRegisterableDomain(kTestRegisterableDomain3);
   BlockUntilOriginDataRemoved(browsing_data::LAST_HOUR,
                               BrowsingDataRemover::REMOVE_SITE_USAGE_DATA,
                               filter);
 
@@ skipping 266 matching lines @@
       new RegistrableDomainFilterBuilder(
           RegistrableDomainFilterBuilder::BLACKLIST));
   filter_builder_2->AddRegisterableDomain("example.com");
 
   MultipleTasksObserver observer(remover);
   BrowsingDataRemoverCompletionInhibitor completion_inhibitor;
 
   // Test several tasks with various configuration of masks, filters, and target
   // observers.
   std::list<BrowsingDataRemover::RemovalTask> tasks;
-  tasks.emplace_back(
-      BrowsingDataRemover::Unbounded(),
-      BrowsingDataRemover::REMOVE_HISTORY,
-      BrowsingDataHelper::UNPROTECTED_WEB,
-      base::WrapUnique(new RegistrableDomainFilterBuilder(
-          RegistrableDomainFilterBuilder::BLACKLIST)),
-      observer.target_a());
-  tasks.emplace_back(
-      BrowsingDataRemover::Unbounded(),
-      BrowsingDataRemover::REMOVE_COOKIES,
-      BrowsingDataHelper::PROTECTED_WEB,
-      base::WrapUnique(new RegistrableDomainFilterBuilder(
-          RegistrableDomainFilterBuilder::BLACKLIST)),
-      nullptr);
+  tasks.emplace_back(BrowsingDataRemover::Unbounded(),
+                     BrowsingDataRemover::REMOVE_HISTORY,
+                     BrowsingDataHelper::UNPROTECTED_WEB,
+                     base::MakeUnique<RegistrableDomainFilterBuilder>(
+                         RegistrableDomainFilterBuilder::BLACKLIST),
+                     observer.target_a());
+  tasks.emplace_back(BrowsingDataRemover::Unbounded(),
+                     BrowsingDataRemover::REMOVE_COOKIES,
+                     BrowsingDataHelper::PROTECTED_WEB,
+                     base::MakeUnique<RegistrableDomainFilterBuilder>(
+                         RegistrableDomainFilterBuilder::BLACKLIST),
+                     nullptr);
   tasks.emplace_back(
       BrowsingDataRemover::TimeRange(base::Time::Now(), base::Time::Max()),
-      BrowsingDataRemover::REMOVE_PASSWORDS,
-      BrowsingDataHelper::ALL,
-      base::WrapUnique(new RegistrableDomainFilterBuilder(
-          RegistrableDomainFilterBuilder::BLACKLIST)),
+      BrowsingDataRemover::REMOVE_PASSWORDS, BrowsingDataHelper::ALL,
+      base::MakeUnique<RegistrableDomainFilterBuilder>(
+          RegistrableDomainFilterBuilder::BLACKLIST),
       observer.target_b());
   tasks.emplace_back(
       BrowsingDataRemover::TimeRange(base::Time(), base::Time::UnixEpoch()),
       BrowsingDataRemover::REMOVE_WEBSQL,
       BrowsingDataHelper::UNPROTECTED_WEB,
       std::move(filter_builder_1),
       observer.target_b());
   tasks.emplace_back(
       BrowsingDataRemover::TimeRange(
           base::Time::UnixEpoch(), base::Time::Now()),
@@ skipping 83 matching lines @@
   EXPECT_TRUE(remover->is_removing());
 
   // Add one more deletion and wait for it.
   BlockUntilBrowsingDataRemoved(
       browsing_data::ALL_TIME,
       BrowsingDataRemover::REMOVE_COOKIES,
       BrowsingDataHelper::UNPROTECTED_WEB);
 
   EXPECT_FALSE(remover->is_removing());
 }