Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/base/mock_audio_renderer_sink.h

Index: media/base/mock_audio_renderer_sink.h
diff --git a/media/base/mock_audio_renderer_sink.h b/media/base/mock_audio_renderer_sink.h
index 2194bc99d926165e961540ec8bb96c53d31de64b..9332e1c1ec8177b7eab0cbfddbe464361b43d036 100644
--- a/media/base/mock_audio_renderer_sink.h
+++ b/media/base/mock_audio_renderer_sink.h
@@ -16,18 +16,29 @@ namespace media {
 
 class FakeOutputDevice;
 
-class MockAudioRendererSink : public RestartableAudioRendererSink {
+class MockAudioRendererSink : public SwitchableAudioRendererSink {
  public:
   MockAudioRendererSink();
   explicit MockAudioRendererSink(OutputDeviceStatus device_status);
+  MockAudioRendererSink(OutputDeviceStatus device_status,
+                        const AudioParameters& device_output_params);
+  MockAudioRendererSink(const std::string& device_id,
+                        OutputDeviceStatus device_status);
+  MockAudioRendererSink(const std::string& device_id,
+                        OutputDeviceStatus device_status,
+                        const AudioParameters& device_output_params);
 
   MOCK_METHOD0(Start, void());
   MOCK_METHOD0(Stop, void());
   MOCK_METHOD0(Pause, void());
   MOCK_METHOD0(Play, void());
   MOCK_METHOD1(SetVolume, bool(double volume));
-  OutputDevice* GetOutputDevice();
 
+  OutputDeviceInfo GetOutputDeviceInfo();
+
+  void SwitchOutputDevice(const std::string& device_id,
+                          const url::Origin& security_origin,
+                          const OutputDeviceStatusCB& callback) override;
   void Initialize(const AudioParameters& params,
                   RenderCallback* renderer) override;
   AudioRendererSink::RenderCallback* callback() { return callback_; }
@@ -37,7 +48,7 @@ class MockAudioRendererSink : public RestartableAudioRendererSink {
 
  private:
   RenderCallback* callback_;
-  scoped_ptr<FakeOutputDevice> output_device_;
+  OutputDeviceInfo output_device_info_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAudioRendererSink);
 };