Convert //media/audio from scoped_ptr to std::unique_ptr

media/audio/sounds/audio_stream_handler.cc

 // Copyright 2013 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 "media/audio/sounds/audio_stream_handler.h"
 
 #include <stdint.h>
 #include <string>
 #include <utility>
 
@@ skipping 22 matching lines @@
 const int kKeepAliveMs = 1500;
 
 AudioStreamHandler::TestObserver* g_observer_for_testing = NULL;
 AudioOutputStream::AudioSourceCallback* g_audio_source_for_testing = NULL;
 
 }  // namespace
 
 class AudioStreamHandler::AudioStreamContainer
     : public AudioOutputStream::AudioSourceCallback {
  public:
-  explicit AudioStreamContainer(scoped_ptr<WavAudioHandler> wav_audio)
+  explicit AudioStreamContainer(std::unique_ptr<WavAudioHandler> wav_audio)
       : started_(false),
         stream_(NULL),
         cursor_(0),
         delayed_stop_posted_(false),
         wav_audio_(std::move(wav_audio)) {
     DCHECK(wav_audio_);
   }
 
   ~AudioStreamContainer() override {
     DCHECK(AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread());
@@ skipping 97 matching lines @@
   }
 
   // Must only be accessed on the AudioManager::GetTaskRunner() thread.
   bool started_;
   AudioOutputStream* stream_;
 
   // All variables below must be accessed under |state_lock_| when |started_|.
   base::Lock state_lock_;
   size_t cursor_;
   bool delayed_stop_posted_;
-  scoped_ptr<WavAudioHandler> wav_audio_;
+  std::unique_ptr<WavAudioHandler> wav_audio_;
   base::CancelableClosure stop_closure_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioStreamContainer);
 };
 
 AudioStreamHandler::AudioStreamHandler(const base::StringPiece& wav_data) {
   AudioManager* manager = AudioManager::Get();
   if (!manager) {
     LOG(ERROR) << "Can't get access to audio manager.";
     return;
   }
 
-  scoped_ptr<WavAudioHandler> wav_audio = WavAudioHandler::Create(wav_data);
+  std::unique_ptr<WavAudioHandler> wav_audio =

[danakj, 2016/04/22 22:47:37]

include memory

[dcheng, 2016/04/22 23:13:20]

Done (but in related header instead)

+      WavAudioHandler::Create(wav_data);
   if (!wav_audio) {
     LOG(ERROR) << "wav_data is not valid";
     return;
   }
 
   const AudioParameters params(
       AudioParameters::AUDIO_PCM_LOW_LATENCY,
       GuessChannelLayout(wav_audio->num_channels()), wav_audio->sample_rate(),
       wav_audio->bits_per_sample(), kDefaultFrameCount);
   if (!params.IsValid()) {
@@ skipping 56 matching lines @@
   g_observer_for_testing = observer;
 }
 
 // static
 void AudioStreamHandler::SetAudioSourceForTesting(
     AudioOutputStream::AudioSourceCallback* source) {
   g_audio_source_for_testing = source;
 }
 
 }  // namespace media