Factor out authorization from AudioRendererHost.

content/browser/renderer_host/media/audio_renderer_host_unittest.cc

Index: content/browser/renderer_host/media/audio_renderer_host_unittest.cc
diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
index 1fe9f76f8b2b4025693e9e5980bc7d92c5b7878c..7513e2d15db0c04acf9e485b94f165c3cd36a2d2 100644
--- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc
@@ -19,6 +19,8 @@
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/common/media/audio_messages.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/test/mock_render_process_host.h"
+#include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "ipc/ipc_message_utils.h"
 #include "media/audio/audio_manager.h"
@@ -36,7 +38,6 @@ using ::testing::NotNull;
 namespace content {
 
 namespace {
-const int kRenderProcessId = 1;
 const int kRenderFrameId = 5;
 const int kStreamId = 50;
 const char kSecurityOrigin[] = "http://localhost";
@@ -52,8 +53,7 @@ void ValidateRenderFrameId(int render_process_id,
                            int render_frame_id,
                            const base::Callback<void(bool)>& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  const bool frame_exists = (render_process_id == kRenderProcessId &&
-                             render_frame_id == kRenderFrameId);
+  const bool frame_exists = (render_frame_id == kRenderFrameId);
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(callback, frame_exists));
 }
@@ -78,12 +78,13 @@ class MockAudioMirroringManager : public AudioMirroringManager {
 class MockAudioRendererHost : public AudioRendererHost {
  public:
   MockAudioRendererHost(base::RunLoop* auth_run_loop,
+                        int render_process_id,
                         media::AudioManager* audio_manager,
                         AudioMirroringManager* mirroring_manager,
                         MediaInternals* media_internals,
                         MediaStreamManager* media_stream_manager,
                         const std::string& salt)
-      : AudioRendererHost(kRenderProcessId,
+      : AudioRendererHost(render_process_id,
                           audio_manager,
                           mirroring_manager,
                           media_internals,
@@ -95,7 +96,6 @@ class MockAudioRendererHost : public AudioRendererHost {
   }
 
   // A list of mock methods.
-  MOCK_METHOD0(ShutdownForBadMessage, void());
   MOCK_METHOD4(OnDeviceAuthorized,
                void(int stream_id,
                     media::OutputDeviceStatus device_status,
@@ -104,6 +104,10 @@ class MockAudioRendererHost : public AudioRendererHost {
   MOCK_METHOD2(OnStreamCreated, void(int stream_id, int length));
   MOCK_METHOD1(OnStreamError, void(int stream_id));
 
+  void ShutdownForBadMessage() override { bad_msg_count++; }
+
+  int bad_msg_count = 0;
+
  private:
   virtual ~MockAudioRendererHost() {
     // Make sure all audio streams have been deleted.
@@ -177,18 +181,16 @@ class MockAudioRendererHost : public AudioRendererHost {
 
 class AudioRendererHostTest : public testing::Test {
  public:
-  AudioRendererHostTest() {
+  AudioRendererHostTest() : render_process_host_(&browser_context_) {
     audio_manager_ = media::AudioManager::CreateForTesting(
         base::ThreadTaskRunnerHandle::Get());
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kUseFakeDeviceForMediaStream);
     media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
     host_ = new MockAudioRendererHost(
-        &auth_run_loop_, audio_manager_.get(), &mirroring_manager_,
-        MediaInternals::GetInstance(), media_stream_manager_.get(),
-        std::string());
-
-    EXPECT_CALL(*host_, ShutdownForBadMessage()).Times(0);
+        &auth_run_loop_, render_process_host_.GetID(), audio_manager_.get(),
+        &mirroring_manager_, MediaInternals::GetInstance(),
+        media_stream_manager_.get(), std::string());
 
     // Simulate IPC channel connected.
     host_->set_peer_process_for_testing(base::Process::Current());
@@ -226,8 +228,8 @@ class AudioRendererHostTest : public testing::Test {
 
     if (expected_device_status == media::OUTPUT_DEVICE_STATUS_OK) {
       EXPECT_CALL(*host_.get(), OnStreamCreated(kStreamId, _));
-      EXPECT_CALL(mirroring_manager_,
-                  AddDiverter(kRenderProcessId, kRenderFrameId, NotNull()))
+      EXPECT_CALL(mirroring_manager_, AddDiverter(render_process_host_.GetID(),
+                                                  kRenderFrameId, NotNull()))
           .RetiresOnSaturation();
     }
 
@@ -344,8 +346,10 @@ class AudioRendererHostTest : public testing::Test {
     run_loop.Run();
   }
 
-  void ExpectShutdown() {
-    EXPECT_CALL(*host_, ShutdownForBadMessage()).Times(1);
+  void AssertBadMsgReported() {
+    // Bad messages can be reported either directly to the RPH or through the
+    // ARH, so we check both of them.
+    EXPECT_EQ(render_process_host_.bad_msg_count() + host_->bad_msg_count, 1);
   }
 
  private:
@@ -355,6 +359,8 @@ class AudioRendererHostTest : public testing::Test {
   TestBrowserThreadBundle thread_bundle_;
   media::ScopedAudioManagerPtr audio_manager_;
   MockAudioMirroringManager mirroring_manager_;
+  TestBrowserContext browser_context_;
+  MockRenderProcessHost render_process_host_;
   scoped_refptr<MockAudioRendererHost> host_;
   base::RunLoop auth_run_loop_;
 
@@ -432,15 +438,15 @@ TEST_F(AudioRendererHostTest, CreateUnauthorizedDevice) {
 }
 
 TEST_F(AudioRendererHostTest, CreateDeviceWithAuthorizationPendingIsError) {
-  ExpectShutdown();
   CreateWithoutWaitingForAuth(kBadDeviceId);
   Close();
+  AssertBadMsgReported();
 }
 
 TEST_F(AudioRendererHostTest, CreateDeviceWithBadSecurityOrigin) {
-  ExpectShutdown();
   RequestDeviceAuthorizationWithBadOrigin(kNondefaultDeviceId);
   Close();
+  AssertBadMsgReported();
 }
 
 TEST_F(AudioRendererHostTest, CreateInvalidDevice) {