Remove ScopedVector from media/audio/

media/audio/audio_manager_base.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 "media/audio/audio_manager_base.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 50 matching lines @@
   std::unique_ptr<AudioOutputDispatcher> dispatcher;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DispatcherParams);
 };
 
 class AudioManagerBase::CompareByParams {
  public:
   explicit CompareByParams(const DispatcherParams* dispatcher)
       : dispatcher_(dispatcher) {}
-  bool operator()(DispatcherParams* dispatcher_in) const {
+  bool operator()(
+      const std::unique_ptr<DispatcherParams>& dispatcher_in) const {
     // We will reuse the existing dispatcher when:
     // 1) Unified IO is not used, input_params and output_params of the
     //    existing dispatcher are the same as the requested dispatcher.
     // 2) Unified IO is used, input_params and output_params of the existing
     //    dispatcher are the same as the request dispatcher.
     return (dispatcher_->input_params.Equals(dispatcher_in->input_params) &&
             dispatcher_->output_params.Equals(dispatcher_in->output_params) &&
             dispatcher_->output_device_id == dispatcher_in->output_device_id);
   }
 
@@ skipping 188 matching lines @@
 
       // Tell the AudioManager to create a fake output device.
       output_params = params;
       output_params.set_format(AudioParameters::AUDIO_FAKE);
     } else if (params.effects() != output_params.effects()) {
       // Turn off effects that weren't requested.
       output_params.set_effects(params.effects() & output_params.effects());
     }
   }
 
-  DispatcherParams* dispatcher_params =
-      new DispatcherParams(params, output_params, output_device_id);
+  std::unique_ptr<DispatcherParams> dispatcher_params_ptr =
+      base::MakeUnique<DispatcherParams>(params, output_params,
+                                         output_device_id);
 
-  AudioOutputDispatchers::iterator it =
-      std::find_if(output_dispatchers_.begin(), output_dispatchers_.end(),
-                   CompareByParams(dispatcher_params));
+  DispatcherParams* dispatcher_params = dispatcher_params_ptr.get();

[tommi (sloooow) - chröme, 2017/05/05 08:58:43]

nit: just remove this variable and pass dispatcher_params_ptr.get() to
CompareByParams()

[Chandan, 2017/05/05 09:19:32]

Done.

+
+  auto it = std::find_if(output_dispatchers_.begin(), output_dispatchers_.end(),
+                         CompareByParams(dispatcher_params));
   if (it != output_dispatchers_.end()) {
-    delete dispatcher_params;
+    dispatcher_params_ptr.reset();

[tommi (sloooow) - chröme, 2017/05/05 08:58:43]

necessary? dispatcher_params_ptr is about to go out of scope

[Chandan, 2017/05/05 09:19:32]

Right. This can be dropped.

     return (*it)->dispatcher->CreateStreamProxy();
   }
 
   const base::TimeDelta kCloseDelay =
       base::TimeDelta::FromSeconds(kStreamCloseDelaySeconds);
   std::unique_ptr<AudioOutputDispatcher> dispatcher;
   if (output_params.format() != AudioParameters::AUDIO_FAKE) {
     // Using unretained for |debug_recording_manager_| is safe since it
     // outlives the dispatchers (cleared in Shutdown()).
     dispatcher = base::MakeUnique<AudioOutputResampler>(
         this, params, output_params, output_device_id, kCloseDelay,
         debug_recording_manager_
             ? base::BindRepeating(
                   &AudioDebugRecordingManager::RegisterDebugRecordingSource,
                   base::Unretained(debug_recording_manager_.get()),
                   FILE_PATH_LITERAL("output"))
             : base::BindRepeating(&GetNullptrAudioDebugRecorder));
   } else {
     dispatcher = base::MakeUnique<AudioOutputDispatcherImpl>(
         this, output_params, output_device_id, kCloseDelay);
   }
 
-  dispatcher_params->dispatcher = std::move(dispatcher);
-  output_dispatchers_.push_back(dispatcher_params);
+  dispatcher_params_ptr->dispatcher = std::move(dispatcher);
+  output_dispatchers_.push_back(std::move(dispatcher_params_ptr));
   return dispatcher_params->dispatcher->CreateStreamProxy();

[tommi (sloooow) - chröme, 2017/05/05 08:58:43]

If we're removing |dispatcher_params|, you'd have to change this to something
like:

return output_dispatchers_.back()->dispatcher->CreateStreamProxy();

[Chandan, 2017/05/05 09:19:32]

Intention was to avoid accessing the vector. Initial idea was to use back(). :)

 }
 
 void AudioManagerBase::ShowAudioInputSettings() {
 }
 
 void AudioManagerBase::GetAudioInputDeviceNames(
     AudioDeviceNames* device_names) {
 }
 
 void AudioManagerBase::GetAudioOutputDeviceNames(
@@ skipping 164 matching lines @@
       std::move(task_runner), std::move(file_task_runner));
 }
 
 void AudioManagerBase::SetMaxStreamCountForTesting(int max_input,
                                                    int max_output) {
   max_num_output_streams_ = max_output;
   max_num_input_streams_ = max_input;
 }
 
 }  // namespace media