Replace base::MakeUnique with std::make_unique in media/

base/memory/ptr_util.h includes are changed to <memory> as well. Bug: 755727 Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel Change-Id: Ib009e868f6b0a0856664a790461132634cc5194c Reviewed-on: https://chromium-review.googlesource.com/848473 Commit-Queue: Gyuyoung Kim <gyuyoung.kim@lge.com> Reviewed-by: Daniel Cheng <dcheng@chromium.org> Reviewed-by: John Rummell <jrummell@chromium.org> Cr-Commit-Position: refs/heads/master@{#528270}
qweri0p · Jan 10, 2018 · 62a5de4 · 62a5de4
1 parent 5fa3f74
commit 62a5de4
Show file tree

Hide file tree

Showing 190 changed files with 542 additions and 532 deletions.
diff --git a/media/audio/alsa/alsa_output_unittest.cc b/media/audio/alsa/alsa_output_unittest.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include <stdint.h>
+#include <memory>
 
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/simple_test_tick_clock.h"
@@ -81,7 +81,7 @@ class MockAlsaWrapper : public AlsaWrapper {
 class MockAudioManagerAlsa : public AudioManagerAlsa {
  public:
   MockAudioManagerAlsa()
-      : AudioManagerAlsa(base::MakeUnique<TestAudioThread>(),
+      : AudioManagerAlsa(std::make_unique<TestAudioThread>(),
                          &fake_audio_log_factory_) {}
   MOCK_METHOD0(Init, void());
   MOCK_METHOD0(HasAudioOutputDevices, bool());

diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
@@ -420,7 +420,7 @@ class AudioAndroidOutputTest : public testing::Test {
   AudioAndroidOutputTest()
       : loop_(new base::MessageLoopForUI()),
         audio_manager_(AudioManager::CreateForTesting(
-            base::MakeUnique<TestAudioThread>())),
+            std::make_unique<TestAudioThread>())),
         audio_manager_device_info_(audio_manager_.get()),
         audio_output_stream_(NULL) {
     // Flush the message loop to ensure that AudioManager is fully initialized.

diff --git a/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc
@@ -4,13 +4,14 @@
 
 #include "media/audio/android/audio_manager_android.h"
 
+#include <memory>
+
 #include "base/android/build_info.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "jni/AudioManagerAndroid_jni.h"
@@ -51,7 +52,7 @@ const int kDefaultOutputBufferSize = 2048;
 std::unique_ptr<AudioManager> CreateAudioManager(
     std::unique_ptr<AudioThread> audio_thread,
     AudioLogFactory* audio_log_factory) {
-  return base::MakeUnique<AudioManagerAndroid>(std::move(audio_thread),
+  return std::make_unique<AudioManagerAndroid>(std::move(audio_thread),
                                                audio_log_factory);
 }
 

diff --git a/media/audio/audio_debug_recording_helper.cc b/media/audio/audio_debug_recording_helper.cc
@@ -4,9 +4,10 @@
 
 #include "media/audio/audio_debug_recording_helper.h"
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/files/file_path.h"
-#include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "media/audio/audio_debug_file_writer.h"
 
@@ -92,7 +93,7 @@ void AudioDebugRecordingHelper::DoWrite(std::unique_ptr<media::AudioBus> data) {
 std::unique_ptr<AudioDebugFileWriter>
 AudioDebugRecordingHelper::CreateAudioDebugFileWriter(
     const AudioParameters& params) {
-  return base::MakeUnique<AudioDebugFileWriter>(params);
+  return std::make_unique<AudioDebugFileWriter>(params);
 }
 
 }  // namespace media
diff --git a/media/audio/audio_debug_recording_helper_unittest.cc b/media/audio/audio_debug_recording_helper_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "media/audio/audio_debug_recording_helper.h"
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ -123,7 +125,7 @@ class AudioDebugRecordingHelperTest : public ::testing::Test {
   std::unique_ptr<AudioDebugRecordingHelper> CreateRecordingHelper(
       const AudioParameters& params,
       base::OnceClosure on_destruction_closure) {
-    return base::MakeUnique<AudioDebugRecordingHelperUnderTest>(
+    return std::make_unique<AudioDebugRecordingHelperUnderTest>(
         params, scoped_task_environment_.GetMainThreadTaskRunner(),
         std::move(on_destruction_closure));
   }

diff --git a/media/audio/audio_debug_recording_manager.cc b/media/audio/audio_debug_recording_manager.cc
@@ -4,6 +4,8 @@
 
 #include "media/audio/audio_debug_recording_manager.h"
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
@@ -102,7 +104,7 @@ AudioDebugRecordingManager::CreateAudioDebugRecordingHelper(
     const AudioParameters& params,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     base::OnceClosure on_destruction_closure) {
-  return base::MakeUnique<AudioDebugRecordingHelper>(
+  return std::make_unique<AudioDebugRecordingHelper>(
       params, task_runner, std::move(on_destruction_closure));
 }
 

diff --git a/media/audio/audio_debug_recording_manager_unittest.cc b/media/audio/audio_debug_recording_manager_unittest.cc
@@ -4,12 +4,12 @@
 
 #include "media/audio/audio_debug_recording_manager.h"
 
+#include <memory>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/test_message_loop.h"
@@ -97,7 +97,7 @@ class AudioDebugRecordingManagerUnderTest : public AudioDebugRecordingManager {
       const AudioParameters& params,
       scoped_refptr<base::SingleThreadTaskRunner> task_runner,
       base::OnceClosure on_destruction_closure) override {
-    return base::MakeUnique<MockAudioDebugRecordingHelper>(
+    return std::make_unique<MockAudioDebugRecordingHelper>(
         params, std::move(task_runner), std::move(on_destruction_closure));
   }
 

diff --git a/media/audio/audio_input_controller_unittest.cc b/media/audio/audio_input_controller_unittest.cc
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <memory>
+
 #include "media/audio/audio_input_controller.h"
 #include "base/bind.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ -101,7 +102,7 @@ class AudioInputControllerTest : public testing::Test {
       : suspend_event_(WaitableEvent::ResetPolicy::AUTOMATIC,
                        WaitableEvent::InitialState::NOT_SIGNALED) {
     audio_manager_ =
-        AudioManager::CreateForTesting(base::MakeUnique<AudioThreadImpl>());
+        AudioManager::CreateForTesting(std::make_unique<AudioThreadImpl>());
   }
   ~AudioInputControllerTest() override {
     audio_manager_->Shutdown();

diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc
@@ -53,7 +53,7 @@ class AudioInputTest : public testing::Test {
   AudioInputTest()
       : message_loop_(base::MessageLoop::TYPE_UI),
         audio_manager_(AudioManager::CreateForTesting(
-            base::MakeUnique<TestAudioThread>())),
+            std::make_unique<TestAudioThread>())),
         audio_input_stream_(NULL) {
     base::RunLoop().RunUntilIdle();
   }

diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc
@@ -76,7 +76,7 @@ class AudioLowLatencyInputOutputTest : public testing::Test {
  protected:
   AudioLowLatencyInputOutputTest() {
     audio_manager_ =
-        AudioManager::CreateForTesting(base::MakeUnique<TestAudioThread>());
+        AudioManager::CreateForTesting(std::make_unique<TestAudioThread>());
   }
 
   ~AudioLowLatencyInputOutputTest() override { audio_manager_->Shutdown(); }

diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
@@ -4,11 +4,12 @@
 
 #include "media/audio/audio_manager_base.h"
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/optional.h"
 #include "base/single_thread_task_runner.h"
@@ -395,7 +396,7 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
   }
 
   std::unique_ptr<DispatcherParams> dispatcher_params =
-      base::MakeUnique<DispatcherParams>(params, output_params,
+      std::make_unique<DispatcherParams>(params, output_params,
                                          output_device_id);
 
   auto it = std::find_if(output_dispatchers_.begin(), output_dispatchers_.end(),
@@ -410,7 +411,7 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
       !output_params.IsBitstreamFormat()) {
     // Using unretained for |debug_recording_manager_| is safe since it
     // outlives the dispatchers (cleared in ShutdownOnAudioThread()).
-    dispatcher = base::MakeUnique<AudioOutputResampler>(
+    dispatcher = std::make_unique<AudioOutputResampler>(
         this, params, output_params, output_device_id, kCloseDelay,
         debug_recording_manager_
             ? base::BindRepeating(
@@ -419,7 +420,7 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
                   FILE_PATH_LITERAL("output"))
             : base::BindRepeating(&GetNullptrAudioDebugRecorder));
   } else {
-    dispatcher = base::MakeUnique<AudioOutputDispatcherImpl>(
+    dispatcher = std::make_unique<AudioOutputDispatcherImpl>(
         this, output_params, output_device_id, kCloseDelay);
   }
 
@@ -589,7 +590,7 @@ void AudioManagerBase::DisableDebugRecording() {
 std::unique_ptr<AudioDebugRecordingManager>
 AudioManagerBase::CreateAudioDebugRecordingManager(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
-  return base::MakeUnique<AudioDebugRecordingManager>(std::move(task_runner));
+  return std::make_unique<AudioDebugRecordingManager>(std::move(task_runner));
 }
 
 void AudioManagerBase::SetMaxStreamCountForTesting(int max_input,

diff --git a/media/audio/audio_manager_unittest.cc b/media/audio/audio_manager_unittest.cc
@@ -12,7 +12,6 @@
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/logging.h"
-#include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
@@ -68,7 +67,7 @@ template <typename T>
 struct TestAudioManagerFactory {
   static std::unique_ptr<AudioManager> Create(
       AudioLogFactory* audio_log_factory) {
-    return base::MakeUnique<T>(base::MakeUnique<TestAudioThread>(),
+    return std::make_unique<T>(std::make_unique<TestAudioThread>(),
                                audio_log_factory);
   }
 };
@@ -82,8 +81,8 @@ struct TestAudioManagerFactory<AudioManagerPulse> {
     pa_context* pa_context = nullptr;
     if (!pulse::InitPulse(&pa_mainloop, &pa_context))
       return nullptr;
-    return base::MakeUnique<AudioManagerPulse>(
-        base::MakeUnique<TestAudioThread>(), audio_log_factory, pa_mainloop,
+    return std::make_unique<AudioManagerPulse>(
+        std::make_unique<TestAudioThread>(), audio_log_factory, pa_mainloop,
         pa_context);
   }
 };
@@ -93,7 +92,7 @@ template <>
 struct TestAudioManagerFactory<std::nullptr_t> {
   static std::unique_ptr<AudioManager> Create(
       AudioLogFactory* audio_log_factory) {
-    return AudioManager::CreateForTesting(base::MakeUnique<TestAudioThread>());
+    return AudioManager::CreateForTesting(std::make_unique<TestAudioThread>());
   }
 };
 
@@ -389,7 +388,7 @@ class AudioManagerTest : public ::testing::Test {
     // TODO(alokp): We should perhaps do this in AudioManager::Create().
     base::RunLoop().RunUntilIdle();
     device_info_accessor_ =
-        base::MakeUnique<AudioDeviceInfoAccessorForTests>(audio_manager_.get());
+        std::make_unique<AudioDeviceInfoAccessorForTests>(audio_manager_.get());
   }
 
   base::TestMessageLoop message_loop_;
@@ -674,7 +673,7 @@ class TestAudioManager : public FakeAudioManager {
 
   std::unique_ptr<AudioDebugRecordingManager> CreateAudioDebugRecordingManager(
       scoped_refptr<base::SingleThreadTaskRunner> task_runner) override {
-    return base::MakeUnique<MockAudioDebugRecordingManager>(
+    return std::make_unique<MockAudioDebugRecordingManager>(
         std::move(task_runner));
   }
 };

diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
@@ -115,7 +115,7 @@ class AudioOutputControllerTest : public testing::Test {
  public:
   AudioOutputControllerTest()
       : audio_manager_(AudioManager::CreateForTesting(
-            base::MakeUnique<TestAudioThread>())) {
+            std::make_unique<TestAudioThread>())) {
     EXPECT_CALL(mock_event_handler_, OnLog(_)).Times(testing::AnyNumber());
     base::RunLoop().RunUntilIdle();
   }

diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
@@ -8,7 +8,6 @@
 #include <string>
 #include <utility>
 
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ -101,7 +100,7 @@ class MockAudioOutputStream : public AudioOutputStream {
 class MockAudioManager : public AudioManagerBase {
  public:
   MockAudioManager()
-      : AudioManagerBase(base::MakeUnique<TestAudioThread>(),
+      : AudioManagerBase(std::make_unique<TestAudioThread>(),
                          &fake_audio_log_factory_) {}
   ~MockAudioManager() override { Shutdown(); }
 
@@ -183,7 +182,7 @@ class AudioOutputProxyTest : public testing::Test {
   }
 
   virtual void InitDispatcher(base::TimeDelta close_delay) {
-    dispatcher_impl_ = base::MakeUnique<AudioOutputDispatcherImpl>(
+    dispatcher_impl_ = std::make_unique<AudioOutputDispatcherImpl>(
         &manager(), params_, std::string(), close_delay);
   }
 
@@ -505,7 +504,7 @@ class AudioOutputResamplerTest : public AudioOutputProxyTest {
     resampler_params_ = AudioParameters(
         AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
         16000, 16, 1024);
-    resampler_ = base::MakeUnique<AudioOutputResampler>(
+    resampler_ = std::make_unique<AudioOutputResampler>(
         &manager(), params_, resampler_params_, std::string(), close_delay,
         base::BindRepeating(&RegisterDebugRecording));
   }

diff --git a/media/audio/audio_output_unittest.cc b/media/audio/audio_output_unittest.cc
@@ -26,9 +26,9 @@ class AudioOutputTest : public ::testing::Test {
  public:
   AudioOutputTest() {
     audio_manager_ =
-        AudioManager::CreateForTesting(base::MakeUnique<TestAudioThread>());
+        AudioManager::CreateForTesting(std::make_unique<TestAudioThread>());
     audio_manager_device_info_ =
-        base::MakeUnique<AudioDeviceInfoAccessorForTests>(audio_manager_.get());
+        std::make_unique<AudioDeviceInfoAccessorForTests>(audio_manager_.get());
     base::RunLoop().RunUntilIdle();
   }
   ~AudioOutputTest() override {

diff --git a/media/audio/cras/cras_input_unittest.cc b/media/audio/cras/cras_input_unittest.cc
@@ -45,7 +45,7 @@ class MockAudioInputCallback : public AudioInputStream::AudioInputCallback {
 class MockAudioManagerCrasInput : public AudioManagerCras {
  public:
   MockAudioManagerCrasInput()
-      : AudioManagerCras(base::MakeUnique<TestAudioThread>(),
+      : AudioManagerCras(std::make_unique<TestAudioThread>(),
                          &fake_audio_log_factory_) {}
 
   // We need to override this function in order to skip checking the number

diff --git a/media/audio/cras/cras_unified_unittest.cc b/media/audio/cras/cras_unified_unittest.cc
@@ -41,7 +41,7 @@ namespace media {
 class MockAudioManagerCras : public AudioManagerCras {
  public:
   MockAudioManagerCras()
-      : AudioManagerCras(base::MakeUnique<TestAudioThread>(),
+      : AudioManagerCras(std::make_unique<TestAudioThread>(),
                          &fake_audio_log_factory_) {}
 
   // We need to override this function in order to skip the checking the number

diff --git a/media/audio/fake_audio_input_stream.cc b/media/audio/fake_audio_input_stream.cc
@@ -132,9 +132,9 @@ std::unique_ptr<AudioSourceCallback> FakeAudioInputStream::ChooseSource() {
           << switches::kUseFileForFakeAudioCapture << ".";
       looping = false;
     }
-    return base::MakeUnique<FileSource>(params_, path_to_wav_file, looping);
+    return std::make_unique<FileSource>(params_, path_to_wav_file, looping);
   }
-  return base::MakeUnique<BeepingSource>(params_);
+  return std::make_unique<BeepingSource>(params_);
 }
 
 void FakeAudioInputStream::BeepOnce() {

diff --git a/media/audio/fake_audio_log_factory.cc b/media/audio/fake_audio_log_factory.cc
@@ -4,10 +4,9 @@
 
 #include "media/audio/fake_audio_log_factory.h"
 
+#include <memory>
 #include <string>
 
-#include "base/memory/ptr_util.h"
-
 namespace media {
 
 class FakeAudioLogImpl : public AudioLog {
@@ -32,7 +31,7 @@ FakeAudioLogFactory::~FakeAudioLogFactory() = default;
 
 std::unique_ptr<AudioLog> FakeAudioLogFactory::CreateAudioLog(
     AudioComponent component) {
-  return base::MakeUnique<FakeAudioLogImpl>();
+  return std::make_unique<FakeAudioLogImpl>();
 }
 
 }  // namespace media