Revert of Add support for the audio-output-device switching IPC mechanism to the renderer lower...

media/audio/audio_output_device.cc

Index: media/audio/audio_output_device.cc
diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc
index 3213400ff344b277eaf8f3c5de4dfccdbbce619e..d55d10077ed47870fb34521fce57bc24ae4d71c8 100644
--- a/media/audio/audio_output_device.cc
+++ b/media/audio/audio_output_device.cc
@@ -4,9 +4,6 @@
 
 #include "media/audio/audio_output_device.h"
 
-#include <string>
-
-#include "base/callback_helpers.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
@@ -48,8 +45,7 @@
       state_(IDLE),
       play_on_start_(true),
       session_id_(-1),
-      stopping_hack_(false),
-      current_switch_request_id_(0) {
+      stopping_hack_(false) {
   CHECK(ipc_);
 
   // The correctness of the code depends on the relative values assigned in the
@@ -79,14 +75,6 @@
   // The current design requires that the user calls Stop() before deleting
   // this class.
   DCHECK(audio_thread_.IsStopped());
-
-  // The following makes it possible for |current_switch_callback_| to release
-  // its bound parameters in the correct thread instead of implicitly releasing
-  // them in the thread where this destructor runs.
-  if (!current_switch_callback_.is_null()) {
-    base::ResetAndReturn(&current_switch_callback_).Run(
-        SWITCH_OUTPUT_DEVICE_RESULT_ERROR_OBSOLETE);
-  }
 }
 
 void AudioOutputDevice::Start() {
@@ -127,16 +115,6 @@
   }
 
   return true;
-}
-
-void AudioOutputDevice::SwitchOutputDevice(
-    const std::string& device_id,
-    const GURL& security_origin,
-    const SwitchOutputDeviceCB& callback) {
-  DVLOG(1) << __FUNCTION__ << "(" << device_id << ")";
-  task_runner()->PostTask(
-      FROM_HERE, base::Bind(&AudioOutputDevice::SwitchOutputDeviceOnIOThread,
-                            this, device_id, security_origin, callback));
 }
 
 void AudioOutputDevice::CreateStreamOnIOThread(const AudioParameters& params) {
@@ -199,21 +177,6 @@
   DCHECK(task_runner()->BelongsToCurrentThread());
   if (state_ >= CREATING_STREAM)
     ipc_->SetVolume(volume);
-}
-
-void AudioOutputDevice::SwitchOutputDeviceOnIOThread(
-    const std::string& device_id,
-    const GURL& security_origin,
-    const SwitchOutputDeviceCB& callback) {
-  DCHECK(task_runner()->BelongsToCurrentThread());
-  DVLOG(1) << __FUNCTION__ << "(" << device_id << "," << security_origin << ")";
-  if (state_ >= CREATING_STREAM) {
-    SetCurrentSwitchRequest(callback);
-    ipc_->SwitchOutputDevice(device_id, security_origin,
-                             current_switch_request_id_);
-  } else {
-    callback.Run(SWITCH_OUTPUT_DEVICE_RESULT_ERROR_NOT_SUPPORTED);
-  }
 }
 
 void AudioOutputDevice::OnStateChanged(AudioOutputIPCDelegateState state) {
@@ -291,32 +254,6 @@
     PlayOnIOThread();
 }
 
-void AudioOutputDevice::SetCurrentSwitchRequest(
-    const SwitchOutputDeviceCB& callback) {
-  DCHECK(task_runner()->BelongsToCurrentThread());
-  DVLOG(1) << __FUNCTION__;
-  // If there is a previous unresolved request, resolve it as obsolete
-  if (!current_switch_callback_.is_null()) {
-    base::ResetAndReturn(&current_switch_callback_).Run(
-        SWITCH_OUTPUT_DEVICE_RESULT_ERROR_OBSOLETE);
-  }
-  current_switch_callback_ = callback;
-  current_switch_request_id_++;
-}
-
-void AudioOutputDevice::OnOutputDeviceSwitched(
-    int request_id,
-    SwitchOutputDeviceResult result) {
-  DCHECK(task_runner()->BelongsToCurrentThread());
-  DCHECK(request_id <= current_switch_request_id_);
-  DVLOG(1) << __FUNCTION__
-           << "(" << request_id << ", " << result << ")";
-  if (request_id != current_switch_request_id_) {
-    return;
-  }
-  base::ResetAndReturn(&current_switch_callback_).Run(result);
-}
-
 void AudioOutputDevice::OnIPCClosed() {
   DCHECK(task_runner()->BelongsToCurrentThread());
   state_ = IPC_CLOSED;