Allow AudioOutputDevice objects to be initialized with a specific hardware output device and store …

content/renderer/media/webrtc_audio_renderer_unittest.cc

Index: content/renderer/media/webrtc_audio_renderer_unittest.cc
diff --git a/content/renderer/media/webrtc_audio_renderer_unittest.cc b/content/renderer/media/webrtc_audio_renderer_unittest.cc
index d94ac97520d93246f18af66ab56d881bd44e6ef6..9fc4fbd0abdd6cf823afba6fd85bb7aefdcc05c0 100644
--- a/content/renderer/media/webrtc_audio_renderer_unittest.cc
+++ b/content/renderer/media/webrtc_audio_renderer_unittest.cc
@@ -21,6 +21,7 @@
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 
 using testing::Return;
+using testing::_;
 
 namespace content {
 
@@ -34,17 +35,20 @@ class MockAudioOutputIPC : public media::AudioOutputIPC {
   MockAudioOutputIPC() {}
   virtual ~MockAudioOutputIPC() {}
 
-  MOCK_METHOD3(CreateStream, void(media::AudioOutputIPCDelegate* delegate,
-                                  const media::AudioParameters& params,
-                                  int session_id));
+  MOCK_METHOD4(RequestDeviceAuthorization,
+               void(media::AudioOutputIPCDelegate* delegate,
+                    int session_id,
+                    const std::string& device_id,
+                    const GURL& security_origin));
+  MOCK_METHOD2(CreateStream,
+               void(media::AudioOutputIPCDelegate* delegate,
+                    const media::AudioParameters& params));
   MOCK_METHOD0(PlayStream, void());
   MOCK_METHOD0(PauseStream, void());
   MOCK_METHOD0(CloseStream, void());
   MOCK_METHOD1(SetVolume, void(double volume));
-  MOCK_METHOD3(SwitchOutputDevice,
-               void(const std::string& device_id,
-                    const GURL& security_origin,
-                    int request_id));
+  MOCK_METHOD2(SwitchOutputDevice,
+               void(const std::string& device_id, const GURL& security_origin));
 };
 
 class FakeAudioOutputDevice
@@ -71,6 +75,9 @@ class MockAudioDeviceFactory : public AudioDeviceFactory {
   MockAudioDeviceFactory() {}
   virtual ~MockAudioDeviceFactory() {}
   MOCK_METHOD1(CreateOutputDevice, media::AudioOutputDevice*(int));
+  MOCK_METHOD2(CreateOutputDevice, media::AudioOutputDevice*(int, int));
+  MOCK_METHOD3(CreateOutputDevice,
+               media::AudioOutputDevice*(int, const std::string&, const GURL&));
   MOCK_METHOD1(CreateInputDevice, media::AudioInputDevice*(int));
 };
 
@@ -104,7 +111,7 @@ class WebRtcAudioRendererTest : public testing::Test {
                                           1,
                                           44100,
                                           kHardwareBufferSize)) {
-    EXPECT_CALL(*factory_.get(), CreateOutputDevice(1))
+    EXPECT_CALL(*factory_.get(), CreateOutputDevice(1, _))
         .WillOnce(Return(mock_output_device_.get()));
     EXPECT_CALL(*mock_output_device_.get(), Start());
     EXPECT_TRUE(renderer_->Initialize(source_.get()));