Replace base::MakeUnique with std::make_unique.

base/memory/ptr_util.h includes will be cleaned up later.

Generated by:
git grep -l base::MakeUnique | xargs perl -pi -e 's/base::MakeUnique/std::make_unique/'
git grep -l MakeUnique< base | xargs perl -pi -e 's/MakeUnique</std::make_unique</'

Presubmit bypassed due to unrelated existing errors in touched lines.

Bug: 755727
No-Presubmit: true
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
Change-Id: Iedc5caf5bc04e119dadd0e3e8cc5c4dbf2fddc80
Reviewed-on: https://chromium-review.googlesource.com/943728
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Jeremy Roman <jbroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#540241}

android_webview/browser/aw_content_browser_client.cc

@@ -525,7 +525,7 @@ AwContentBrowserClient::CreateThrottlesForNavigation(
     throttles.push_back(
         navigation_interception::InterceptNavigationDelegate::CreateThrottleFor(
             navigation_handle));
-    throttles.push_back(base::MakeUnique<PolicyBlacklistNavigationThrottle>(
+    throttles.push_back(std::make_unique<PolicyBlacklistNavigationThrottle>(
         navigation_handle, browser_context_.get()));
   }
   return throttles;

base/message_loop/message_loop_unittest.cc

@@ -311,7 +311,7 @@ TEST(MessageLoopTest, RunTasksWhileShuttingDownJavaThread) {
   const int kNumPosts = 6;
   DummyTaskObserver observer(kNumPosts, 1);
 
-  auto java_thread = MakeUnique<android::JavaHandlerThread>("test");
+  auto java_thread = std::make_unique<android::JavaHandlerThread>("test");
   java_thread->Start();
 
   java_thread->message_loop()->task_runner()->PostTask(

base/task_scheduler/scheduler_worker_pool_impl_unittest.cc

@@ -192,7 +192,8 @@ TEST_P(TaskSchedulerWorkerPoolImplTestParam, PostTasksWaitAllWorkersIdle) {
       threads_posting_tasks;
   for (size_t i = 0; i < kNumThreadsPostingTasks; ++i) {
     threads_posting_tasks.push_back(
-        MakeUnique<ThreadPostingTasksWaitIdle>(worker_pool_.get(), GetParam()));
+        std::make_unique<ThreadPostingTasksWaitIdle>(worker_pool_.get(),
+                                                     GetParam()));
     threads_posting_tasks.back()->Start();
   }
 

base/threading/sequence_local_storage_slot.h

@@ -75,7 +75,7 @@ class SequenceLocalStorageSlot {
   // store a std::unique_ptr<T>. This is enforced by the
   // DISALLOW_COPY_AND_ASSIGN style rather than directly by this class however.
   void Set(T value) {
-    // Allocates the |value| with new rather than MakeUnique.
+    // Allocates the |value| with new rather than std::make_unique.
     // Since SequenceLocalStorageMap needs to store values of various types
     // within the same map, the type of value_destructor_pair.value is void*
     // (std::unique_ptr<void> is invalid). Memory is freed by calling

base/trace_event/memory_dump_manager.cc

@@ -911,8 +911,8 @@ MemoryDumpManager::ProcessMemoryDumpAsyncState::ProcessMemoryDumpAsyncState(
   pending_dump_providers.reserve(dump_providers.size());
   pending_dump_providers.assign(dump_providers.rbegin(), dump_providers.rend());
   MemoryDumpArgs args = {req_args.level_of_detail, req_args.dump_guid};
-  process_memory_dump =
-      MakeUnique<ProcessMemoryDump>(heap_profiler_serialization_state, args);
+  process_memory_dump = std::make_unique<ProcessMemoryDump>(
+      heap_profiler_serialization_state, args);
 }
 
 MemoryDumpManager::ProcessMemoryDumpAsyncState::~ProcessMemoryDumpAsyncState() =

base/trace_event/process_memory_dump_unittest.cc

@@ -69,8 +69,9 @@ void Unmap(void* addr, size_t size) {
 
 TEST(ProcessMemoryDumpTest, MoveConstructor) {
   auto heap_state = MakeRefCounted<HeapProfilerSerializationState>();
-  heap_state->SetStackFrameDeduplicator(MakeUnique<StackFrameDeduplicator>());
-  heap_state->SetTypeNameDeduplicator(MakeUnique<TypeNameDeduplicator>());
+  heap_state->SetStackFrameDeduplicator(
+      std::make_unique<StackFrameDeduplicator>());
+  heap_state->SetTypeNameDeduplicator(std::make_unique<TypeNameDeduplicator>());
 
   ProcessMemoryDump pmd1 = ProcessMemoryDump(heap_state, kDetailedDumpArgs);
   pmd1.CreateAllocatorDump("mad1");
@@ -88,15 +89,16 @@ TEST(ProcessMemoryDumpTest, MoveConstructor) {
   EXPECT_EQ(heap_state.get(), pmd2.heap_profiler_serialization_state().get());
 
   // Check that calling serialization routines doesn't cause a crash.
-  auto traced_value = MakeUnique<TracedValue>();
+  auto traced_value = std::make_unique<TracedValue>();
   pmd2.SerializeAllocatorDumpsInto(traced_value.get());
   pmd2.SerializeHeapProfilerDumpsInto(traced_value.get());
 }
 
 TEST(ProcessMemoryDumpTest, MoveAssignment) {
   auto heap_state = MakeRefCounted<HeapProfilerSerializationState>();
-  heap_state->SetStackFrameDeduplicator(MakeUnique<StackFrameDeduplicator>());
-  heap_state->SetTypeNameDeduplicator(MakeUnique<TypeNameDeduplicator>());
+  heap_state->SetStackFrameDeduplicator(
+      std::make_unique<StackFrameDeduplicator>());
+  heap_state->SetTypeNameDeduplicator(std::make_unique<TypeNameDeduplicator>());
 
   ProcessMemoryDump pmd1 = ProcessMemoryDump(heap_state, kDetailedDumpArgs);
   pmd1.CreateAllocatorDump("mad1");
@@ -117,7 +119,7 @@ TEST(ProcessMemoryDumpTest, MoveAssignment) {
   EXPECT_EQ(heap_state.get(), pmd2.heap_profiler_serialization_state().get());
 
   // Check that calling serialization routines doesn't cause a crash.
-  auto traced_value = MakeUnique<TracedValue>();
+  auto traced_value = std::make_unique<TracedValue>();
   pmd2.SerializeAllocatorDumpsInto(traced_value.get());
   pmd2.SerializeHeapProfilerDumpsInto(traced_value.get());
 }
@@ -146,7 +148,7 @@ TEST(ProcessMemoryDumpTest, Clear) {
   ASSERT_EQ(nullptr, pmd1->GetSharedGlobalAllocatorDump(shared_mad_guid2));
 
   // Check that calling serialization routines doesn't cause a crash.
-  auto traced_value = MakeUnique<TracedValue>();
+  auto traced_value = std::make_unique<TracedValue>();
   pmd1->SerializeAllocatorDumpsInto(traced_value.get());
   pmd1->SerializeHeapProfilerDumpsInto(traced_value.get());
 

cc/animation/animation_player_unittest.cc

@@ -158,7 +158,7 @@ class AnimationTest : public AnimationTimelinesTest {
 
 TEST_F(AnimationTest, AttachDetachLayerIfTimelineAttached) {
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id_));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id_));
   ASSERT_TRUE(animation_->GetKeyframeEffectById(keyframe_effect_id_));
   EXPECT_FALSE(animation_->GetKeyframeEffectById(keyframe_effect_id_)
                    ->needs_push_properties());
@@ -236,7 +236,7 @@ TEST_F(AnimationTest, AttachDetachTimelineIfLayerAttached) {
   host_->AddAnimationTimeline(timeline_);
 
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id_));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id_));
   ASSERT_TRUE(animation_->GetKeyframeEffectById(keyframe_effect_id_));
 
   EXPECT_FALSE(animation_->GetKeyframeEffectById(keyframe_effect_id_)
@@ -289,7 +289,7 @@ TEST_F(AnimationTest, PropertiesMutate) {
   host_->AddAnimationTimeline(timeline_);
 
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id_));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id_));
   ASSERT_TRUE(animation_->GetKeyframeEffectById(keyframe_effect_id_));
 
   timeline_->AttachAnimation(animation_);
@@ -382,11 +382,11 @@ TEST_F(AnimationTest, AttachTwoAnimationsToOneLayer) {
 
   KeyframeEffectId keyframe_effect_id1 = animation1->NextKeyframeEffectId();
   animation1->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id1));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id1));
   ASSERT_TRUE(animation1->GetKeyframeEffectById(keyframe_effect_id1));
   KeyframeEffectId keyframe_effect_id2 = animation2->NextKeyframeEffectId();
   animation2->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id2));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id2));
   ASSERT_TRUE(animation2->GetKeyframeEffectById(keyframe_effect_id2));
 
   host_->AddAnimationTimeline(timeline_);
@@ -474,7 +474,7 @@ TEST_F(AnimationTest, AddRemoveAnimationToNonAttachedAnimation) {
   client_impl_.RegisterElement(element_id_, ElementListType::ACTIVE);
 
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id_));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id_));
   ASSERT_TRUE(animation_->GetKeyframeEffectById(keyframe_effect_id_));
 
   const double duration = 1.;
@@ -552,7 +552,7 @@ TEST_F(AnimationTest, AddRemoveAnimationCausesSetNeedsCommit) {
   client_.RegisterElement(element_id_, ElementListType::ACTIVE);
   host_->AddAnimationTimeline(timeline_);
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id_));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id_));
   ASSERT_TRUE(animation_->GetKeyframeEffectById(keyframe_effect_id_));
 
   timeline_->AttachAnimation(animation_);
@@ -582,7 +582,7 @@ TEST_F(AnimationTest, AddRemoveAnimationCausesSetNeedsCommit) {
 TEST_F(AnimationTest, SwitchToLayer) {
   host_->AddAnimationTimeline(timeline_);
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id_));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id_));
   timeline_->AttachAnimation(animation_);
   animation_->AttachElementForKeyframeEffect(element_id_, keyframe_effect_id_);
 
@@ -641,7 +641,7 @@ TEST_F(AnimationTest, SwitchToLayer) {
 
 TEST_F(AnimationTest, ToString) {
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id_));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id_));
   animation_->AttachElementForKeyframeEffect(element_id_, keyframe_effect_id_);
   EXPECT_EQ(
       base::StringPrintf("Animation{id=%d, element_id=%s, keyframe_models=[]}",
@@ -679,7 +679,7 @@ TEST_F(AnimationTest, ToString) {
       animation_->NextKeyframeEffectId();
   ElementId second_element_id(NextTestLayerId());
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(second_keyframe_effect_id));
+      std::make_unique<KeyframeEffect>(second_keyframe_effect_id));
   animation_->AttachElementForKeyframeEffect(second_element_id,
                                              second_keyframe_effect_id);
   animation_->AddKeyframeModelForKeyframeEffect(
@@ -711,14 +711,14 @@ TEST_F(AnimationTest,
   KeyframeEffectId keyframe_effect_id1 = animation_->NextKeyframeEffectId();
 
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id1));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id1));
   ASSERT_TRUE(animation_->GetKeyframeEffectById(keyframe_effect_id1));
   EXPECT_FALSE(animation_->GetKeyframeEffectById(keyframe_effect_id1)
                    ->needs_push_properties());
 
   KeyframeEffectId keyframe_effect_id2 = animation_->NextKeyframeEffectId();
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id2));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id2));
   ASSERT_TRUE(animation_->GetKeyframeEffectById(keyframe_effect_id2));
   EXPECT_FALSE(animation_->GetKeyframeEffectById(keyframe_effect_id2)
                    ->needs_push_properties());
@@ -838,14 +838,14 @@ TEST_F(AnimationTest,
   KeyframeEffectId keyframe_effect_id1 = animation_->NextKeyframeEffectId();
 
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id1));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id1));
   ASSERT_TRUE(animation_->GetKeyframeEffectById(keyframe_effect_id1));
   EXPECT_FALSE(animation_->GetKeyframeEffectById(keyframe_effect_id1)
                    ->needs_push_properties());
 
   KeyframeEffectId keyframe_effect_id2 = animation_->NextKeyframeEffectId();
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id2));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id2));
   ASSERT_TRUE(animation_->GetKeyframeEffectById(keyframe_effect_id2));
   EXPECT_FALSE(animation_->GetKeyframeEffectById(keyframe_effect_id2)
                    ->needs_push_properties());
@@ -943,14 +943,14 @@ TEST_F(AnimationTest, TickingAnimationsFromTwoKeyframeEffects) {
   KeyframeEffectId keyframe_effect_id1 = animation_->NextKeyframeEffectId();
 
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id1));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id1));
   ASSERT_TRUE(animation_->GetKeyframeEffectById(keyframe_effect_id1));
   EXPECT_FALSE(animation_->GetKeyframeEffectById(keyframe_effect_id1)
                    ->needs_push_properties());
 
   KeyframeEffectId keyframe_effect_id2 = animation_->NextKeyframeEffectId();
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id2));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id2));
   ASSERT_TRUE(animation_->GetKeyframeEffectById(keyframe_effect_id2));
   EXPECT_FALSE(animation_->GetKeyframeEffectById(keyframe_effect_id2)
                    ->needs_push_properties());
@@ -1028,7 +1028,7 @@ TEST_F(AnimationTest, KeyframeEffectSyncToImplTest) {
 
   KeyframeEffectId keyframe_effect_id1 = animation_->NextKeyframeEffectId();
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id1));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id1));
   EXPECT_TRUE(animation_->GetKeyframeEffectById(keyframe_effect_id1));
   EXPECT_FALSE(animation_->GetKeyframeEffectById(keyframe_effect_id1)
                    ->needs_push_properties());
@@ -1045,7 +1045,7 @@ TEST_F(AnimationTest, KeyframeEffectSyncToImplTest) {
 
   KeyframeEffectId keyframe_effect_id2 = animation_->NextKeyframeEffectId();
   animation_->AddKeyframeEffect(
-      base::MakeUnique<KeyframeEffect>(keyframe_effect_id2));
+      std::make_unique<KeyframeEffect>(keyframe_effect_id2));
   EXPECT_TRUE(timeline_->needs_push_properties());
 
   host_->PushPropertiesTo(host_impl_);

cc/animation/keyframe_effect.cc

@@ -59,7 +59,7 @@ KeyframeEffect::~KeyframeEffect() {
 }
 
 std::unique_ptr<KeyframeEffect> KeyframeEffect::Create(KeyframeEffectId id) {
-  return base::MakeUnique<KeyframeEffect>(id);
+  return std::make_unique<KeyframeEffect>(id);
 }
 
 std::unique_ptr<KeyframeEffect> KeyframeEffect::CreateImplInstance() const {

cc/animation/single_keyframe_effect_animation.cc

@@ -28,15 +28,15 @@ SingleKeyframeEffectAnimation::Create(int id) {
 SingleKeyframeEffectAnimation::SingleKeyframeEffectAnimation(int id)
     : Animation(id) {
   DCHECK(id_);
-  AddKeyframeEffect(base::MakeUnique<KeyframeEffect>(NextKeyframeEffectId()));
+  AddKeyframeEffect(std::make_unique<KeyframeEffect>(NextKeyframeEffectId()));
 }
 
 SingleKeyframeEffectAnimation::SingleKeyframeEffectAnimation(
     int id,
     size_t keyframe_effect_id)
     : Animation(id) {
   DCHECK(id_);
-  AddKeyframeEffect(base::MakeUnique<KeyframeEffect>(keyframe_effect_id));
+  AddKeyframeEffect(std::make_unique<KeyframeEffect>(keyframe_effect_id));
 }
 
 SingleKeyframeEffectAnimation::~SingleKeyframeEffectAnimation() {}

chrome/browser/ntp_snippets/content_suggestions_service_factory.cc

@@ -388,7 +388,7 @@ void RegisterArticleProviderIfEnabled(ContentSuggestionsService* service,
       service, pref_service, g_browser_process->GetApplicationLocale(),
       service->category_ranker(), service->remote_suggestions_scheduler(),
       std::move(suggestions_fetcher),
-      std::make_unique<ImageFetcherImpl>(base::MakeUnique<ImageDecoderImpl>(),
+      std::make_unique<ImageFetcherImpl>(std::make_unique<ImageDecoderImpl>(),
                                          request_context.get()),
       std::make_unique<RemoteSuggestionsDatabase>(database_dir),
       std::make_unique<RemoteSuggestionsStatusServiceImpl>(

chrome/common/chrome_content_client.cc

@@ -516,17 +516,17 @@ void ChromeContentClient::AddPepperPlugins(
   if (!sandbox::Credentials::HasFileSystemAccess())
     return;
 
-  auto component_flash = base::MakeUnique<content::PepperPluginInfo>();
+  auto component_flash = std::make_unique<content::PepperPluginInfo>();
   if (!disable_bundled_flash &&
       GetComponentUpdatedPepperFlash(component_flash.get()))
     flash_versions.push_back(std::move(component_flash));
 #endif  // defined(OS_LINUX)
 
-  auto command_line_flash = base::MakeUnique<content::PepperPluginInfo>();
+  auto command_line_flash = std::make_unique<content::PepperPluginInfo>();
   if (GetCommandLinePepperFlash(command_line_flash.get()))
     flash_versions.push_back(std::move(command_line_flash));
 
-  auto system_flash = base::MakeUnique<content::PepperPluginInfo>();
+  auto system_flash = std::make_unique<content::PepperPluginInfo>();
   if (GetSystemPepperFlash(system_flash.get()))
     flash_versions.push_back(std::move(system_flash));
 
@@ -738,7 +738,7 @@ content::OriginTrialPolicy* ChromeContentClient::GetOriginTrialPolicy() {
   // separate worker thread).
   base::AutoLock auto_lock(origin_trial_policy_lock_);
   if (!origin_trial_policy_)
-    origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>();
+    origin_trial_policy_ = std::make_unique<ChromeOriginTrialPolicy>();
   return origin_trial_policy_.get();
 }
 

chrome/common/chrome_content_client_unittest.cc

@@ -110,7 +110,7 @@ TEST(ChromeContentClientTest, FindMostRecent) {
   // Now test the vector with one element.
   content::PepperPluginInfo info;
   info.version = "1.0.0.0";
-  version_vector.push_back(base::MakeUnique<content::PepperPluginInfo>(info));
+  version_vector.push_back(std::make_unique<content::PepperPluginInfo>(info));
 
   content::PepperPluginInfo* most_recent =
       ChromeContentClient::FindMostRecentPlugin(version_vector);
@@ -125,22 +125,22 @@ TEST(ChromeContentClientTest, FindMostRecent) {
 
   // Test highest version is picked.
   version_vector.clear();
-  version_vector.push_back(base::MakeUnique<content::PepperPluginInfo>(info5));
+  version_vector.push_back(std::make_unique<content::PepperPluginInfo>(info5));
   version_vector.push_back(
-      base::MakeUnique<content::PepperPluginInfo>(info6_12));
+      std::make_unique<content::PepperPluginInfo>(info6_12));
   version_vector.push_back(
-      base::MakeUnique<content::PepperPluginInfo>(info6_13));
+      std::make_unique<content::PepperPluginInfo>(info6_13));
 
   most_recent = ChromeContentClient::FindMostRecentPlugin(version_vector);
   EXPECT_EQ("6.0.0.13", most_recent->version);
 
   // Test that order does not matter, validates tests below.
   version_vector.clear();
   version_vector.push_back(
-      base::MakeUnique<content::PepperPluginInfo>(info6_13));
+      std::make_unique<content::PepperPluginInfo>(info6_13));
   version_vector.push_back(
-      base::MakeUnique<content::PepperPluginInfo>(info6_12));
-  version_vector.push_back(base::MakeUnique<content::PepperPluginInfo>(info5));
+      std::make_unique<content::PepperPluginInfo>(info6_12));
+  version_vector.push_back(std::make_unique<content::PepperPluginInfo>(info5));
 
   most_recent = ChromeContentClient::FindMostRecentPlugin(version_vector);
   EXPECT_EQ("6.0.0.13", most_recent->version);
@@ -161,9 +161,9 @@ TEST(ChromeContentClientTest, FindMostRecent) {
   // 2. Component update.
   version_vector.clear();
   version_vector.push_back(
-      base::MakeUnique<content::PepperPluginInfo>(system_flash));
+      std::make_unique<content::PepperPluginInfo>(system_flash));
   version_vector.push_back(
-      base::MakeUnique<content::PepperPluginInfo>(component_flash));
+      std::make_unique<content::PepperPluginInfo>(component_flash));
   most_recent = ChromeContentClient::FindMostRecentPlugin(version_vector);
   EXPECT_STREQ("system_flash", most_recent->name.c_str());
 }

chrome/common/custom_handlers/protocol_handler.cc

@@ -61,7 +61,7 @@ GURL ProtocolHandler::TranslateUrl(const GURL& url) const {
 }
 
 std::unique_ptr<base::DictionaryValue> ProtocolHandler::Encode() const {
-  auto d = base::MakeUnique<base::DictionaryValue>();
+  auto d = std::make_unique<base::DictionaryValue>();
   d->SetString("protocol", protocol_);
   d->SetString("url", url_.spec());
   return d;