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

media/audio/audio_output_device.h

 // 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.
 //
 // Audio rendering unit utilizing audio output stream provided by browser
 // process through IPC.
 //
 // Relationship of classes.
 //
 //  AudioOutputController                AudioOutputDevice
@@ skipping 40 matching lines @@
 //    turn calls AudioRendererSink::RenderCallback which feeds audio samples to
 //    the audio layer in the browser process using sync sockets and shared
 //    memory.
 //
 // Implementation notes:
 // - The user must call Stop() before deleting the class instance.
 
 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_DEVICE_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_DEVICE_H_
 
-#include <string>
-
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "media/audio/audio_device_thread.h"
 #include "media/audio/audio_output_ipc.h"
 #include "media/audio/audio_parameters.h"
 #include "media/audio/scoped_task_runner_observer.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/media_export.h"
@@ skipping 17 matching lines @@
                                int session_id);
 
   // AudioRendererSink implementation.
   void Initialize(const AudioParameters& params,
                   RenderCallback* callback) override;
   void Start() override;
   void Stop() override;
   void Play() override;
   void Pause() override;
   bool SetVolume(double volume) override;
-  void SwitchOutputDevice(const std::string& device_id,
-                          const GURL& security_origin,
-                          const SwitchOutputDeviceCB& callback) override;
 
   // Methods called on IO thread ----------------------------------------------
   // AudioOutputIPCDelegate methods.
   void OnStateChanged(AudioOutputIPCDelegateState state) override;
   void OnStreamCreated(base::SharedMemoryHandle handle,
                        base::SyncSocket::Handle socket_handle,
                        int length) override;
-  void OnOutputDeviceSwitched(int request_id,
-                              SwitchOutputDeviceResult result) override;
   void OnIPCClosed() override;
 
  protected:
   // Magic required by ref_counted.h to avoid any code deleting the object
   // accidentally while there are references to it.
   friend class base::RefCountedThreadSafe<AudioOutputDevice>;
   ~AudioOutputDevice() override;
 
  private:
   // Note: The ordering of members in this enum is critical to correct behavior!
   enum State {
     IPC_CLOSED,  // No more IPCs can take place.
     IDLE,  // Not started.
     CREATING_STREAM,  // Waiting for OnStreamCreated() to be called back.
     PAUSED,  // Paused.  OnStreamCreated() has been called.  Can Play()/Stop().
     PLAYING,  // Playing back.  Can Pause()/Stop().
   };
 
   // Methods called on IO thread ----------------------------------------------
   // The following methods are tasks posted on the IO thread that need to
   // be executed on that thread.  They use AudioOutputIPC to send IPC messages
   // upon state changes.
   void CreateStreamOnIOThread(const AudioParameters& params);
   void PlayOnIOThread();
   void PauseOnIOThread();
   void ShutDownOnIOThread();
   void SetVolumeOnIOThread(double volume);
-  void SwitchOutputDeviceOnIOThread(const std::string& device_id,
-                                    const GURL& security_origin,
-                                    const SwitchOutputDeviceCB& callback);
 
   // base::MessageLoop::DestructionObserver implementation for the IO loop.
   // If the IO loop dies before we do, we shut down the audio thread from here.
   void WillDestroyCurrentMessageLoop() override;
 
-  void SetCurrentSwitchRequest(const SwitchOutputDeviceCB& callback);
-
   AudioParameters audio_parameters_;
 
   RenderCallback* callback_;
 
   // A pointer to the IPC layer that takes care of sending requests over to
   // the AudioRendererHost.  Only valid when state_ != IPC_CLOSED and must only
   // be accessed on the IO thread.
   scoped_ptr<AudioOutputIPC> ipc_;
 
   // Current state (must only be accessed from the IO thread).  See comments for
@@ skipping 17 matching lines @@
   scoped_ptr<AudioOutputDevice::AudioThreadCallback> audio_callback_;
 
   // Temporary hack to ignore OnStreamCreated() due to the user calling Stop()
   // so we don't start the audio thread pointing to a potentially freed
   // |callback_|.
   //
   // TODO(scherkus): Replace this by changing AudioRendererSink to either accept
   // the callback via Start(). See http://crbug.com/151051 for details.
   bool stopping_hack_;
 
-  int current_switch_request_id_;
-  SwitchOutputDeviceCB current_switch_callback_;
-
   DISALLOW_COPY_AND_ASSIGN(AudioOutputDevice);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_DEVICE_H_