Do not pass the string device_id via IPC message to create an audio input stream

content/renderer/pepper/pepper_platform_audio_input_impl.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 "content/renderer/pepper/pepper_platform_audio_input_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "build/build_config.h"
@@ skipping 88 matching lines @@
     }
   }
 }
 
 void PepperPlatformAudioInputImpl::OnVolume(double volume) {}
 
 void PepperPlatformAudioInputImpl::OnStateChanged(
     media::AudioInputIPCDelegate::State state) {
 }
 
-void PepperPlatformAudioInputImpl::OnDeviceReady(const std::string& device_id) {
-  DCHECK(ChildProcess::current()->io_message_loop_proxy()->
-      BelongsToCurrentThread());
-
-  if (shutdown_called_)
-    return;
-
-  if (device_id.empty()) {
-    main_message_loop_proxy_->PostTask(
-        FROM_HERE,
-        base::Bind(&PepperPlatformAudioInputImpl::NotifyStreamCreationFailed,
-                   this));
-  } else {
-    // We will be notified by OnStreamCreated().
-    ipc_->CreateStream(stream_id_, params_, device_id, false, 1);
-  }
-}
-
 void PepperPlatformAudioInputImpl::OnIPCClosed() {
   ipc_ = NULL;
 }
 
 PepperPlatformAudioInputImpl::~PepperPlatformAudioInputImpl() {
   // Make sure we have been shut down. Warning: this may happen on the I/O
   // thread!
   // Although these members should be accessed on a specific thread (either the
   // main thread or the I/O thread), it should be fine to examine their value
   // here.
@@ skipping 24 matching lines @@
     return false;
 
   plugin_delegate_ = plugin_delegate;
   render_view_id_ = plugin_delegate_->GetRoutingID();
   client_ = client;
 
   params_.Reset(media::AudioParameters::AUDIO_PCM_LINEAR,
                 media::CHANNEL_LAYOUT_MONO, 1, 0,
                 sample_rate, 16, frames_per_buffer);
 
-  if (device_id.empty()) {
-    // Use the default device.
-    ChildProcess::current()->io_message_loop()->PostTask(
-        FROM_HERE,
-        base::Bind(&PepperPlatformAudioInputImpl::InitializeOnIOThread,
-                   this, 0));
-  } else {
-    // We need to open the device and obtain the label and session ID before
-    // initializing.
-    plugin_delegate_->OpenDevice(
-        PP_DEVICETYPE_DEV_AUDIOCAPTURE, device_id,
-        base::Bind(&PepperPlatformAudioInputImpl::OnDeviceOpened, this));
-  }
+  // We need to open the device and obtain the label and session ID before
+  // initializing.
+  plugin_delegate_->OpenDevice(
+      PP_DEVICETYPE_DEV_AUDIOCAPTURE,
+      device_id.empty() ? media::AudioManagerBase::kDefaultDeviceId : device_id,
+      base::Bind(&PepperPlatformAudioInputImpl::OnDeviceOpened, this));
+
   return true;
 }
 
 void PepperPlatformAudioInputImpl::InitializeOnIOThread(int session_id) {
   DCHECK(ChildProcess::current()->io_message_loop_proxy()->
       BelongsToCurrentThread());
 
   if (shutdown_called_)
     return;
 
   // Make sure we don't call init more than once.
   DCHECK_EQ(0, stream_id_);
   stream_id_ = ipc_->AddDelegate(this);
   DCHECK_NE(0, stream_id_);
 
-  if (!session_id) {
-    // We will be notified by OnStreamCreated().
-    ipc_->CreateStream(stream_id_, params_,
-        media::AudioManagerBase::kDefaultDeviceId, false, 1);
-  } else {
-    // We will be notified by OnDeviceReady().
-    ipc_->StartDevice(stream_id_, session_id);
-  }
+  // We will be notified by OnStreamCreated().
+  ipc_->CreateStream(stream_id_, session_id, params_, false, 1);
 }
 
 void PepperPlatformAudioInputImpl::StartCaptureOnIOThread() {
   DCHECK(ChildProcess::current()->io_message_loop_proxy()->
       BelongsToCurrentThread());
 
   if (stream_id_) {
     ipc_->AssociateStreamWithConsumer(stream_id_, render_view_id_);
     ipc_->RecordStream(stream_id_);
   }
@@ skipping 66 matching lines @@
 }
 
 void PepperPlatformAudioInputImpl::NotifyStreamCreationFailed() {
   DCHECK(main_message_loop_proxy_->BelongsToCurrentThread());
 
   if (client_)
     client_->StreamCreationFailed();
 }
 
 }  // namespace content