Simplify AudioInputRendererHost IPC interface.

content/browser/renderer_host/media/audio_input_renderer_host_unittest.cc

 // Copyright 2016 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.
 
 #include "content/browser/renderer_host/media/audio_input_renderer_host.h"
 
+#include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/media/capture/audio_mirroring_manager.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
@@ skipping 54 matching lines @@
 }
 
 class MockRenderer {
  public:
   MOCK_METHOD5(NotifyStreamCreated,
                void(int /*stream_id*/,
                     base::SharedMemoryHandle /*handle*/,
                     base::SyncSocket::TransitDescriptor /*socket_desriptor*/,
                     uint32_t /*length*/,
                     uint32_t /*total_segments*/));
-  MOCK_METHOD2(NotifyStreamVolume, void(int /*stream_id*/, double /*volume*/));
-  MOCK_METHOD2(NotifyStreamStateChanged,
-               void(int /*stream_id*/,
-                    media::AudioInputIPCDelegateState /*state*/));
+  MOCK_METHOD1(NotifyStreamError, void(int /*stream_id*/));
   MOCK_METHOD0(WasShutDown, void());
 };
 
 // This class overrides Send to intercept the messages that the
 // AudioInputRendererHost sends to the renderer. They are sent to
 // the provided MockRenderer instead.
 class AudioInputRendererHostWithInterception : public AudioInputRendererHost {
  public:
   AudioInputRendererHostWithInterception(
       int render_process_id,
@@ skipping 17 matching lines @@
   ~AudioInputRendererHostWithInterception() override = default;
 
  private:
   bool Send(IPC::Message* message) override {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     bool handled = true;
 
     IPC_BEGIN_MESSAGE_MAP(AudioInputRendererHostWithInterception, *message)
       IPC_MESSAGE_HANDLER(AudioInputMsg_NotifyStreamCreated,
                           NotifyRendererStreamCreated)
-      IPC_MESSAGE_HANDLER(AudioInputMsg_NotifyStreamVolume,
-                          NotifyRendererStreamVolume)
-      IPC_MESSAGE_HANDLER(AudioInputMsg_NotifyStreamStateChanged,
-                          NotifyRendererStreamStateChanged)
+      IPC_MESSAGE_HANDLER(AudioInputMsg_NotifyStreamError,
+                          NotifyRendererStreamError)
       IPC_MESSAGE_UNHANDLED(handled = false)
     IPC_END_MESSAGE_MAP()
 
     EXPECT_TRUE(handled);
     delete message;
     return true;
   }
 
   void ShutdownForBadMessage() override { renderer_->WasShutDown(); }
 
   void NotifyRendererStreamCreated(
       int stream_id,
       base::SharedMemoryHandle handle,
       base::SyncSocket::TransitDescriptor socket_descriptor,
       uint32_t length,
       uint32_t total_segments) {
     // It's difficult to check that the sync socket and shared memory is
     // valid in the gmock macros, so we check them here.
     EXPECT_NE(base::SyncSocket::UnwrapHandle(socket_descriptor),
               base::SyncSocket::kInvalidHandle);
     base::SharedMemory memory(handle, /*read_only*/ true);
     EXPECT_TRUE(memory.Map(length));
     renderer_->NotifyStreamCreated(stream_id, handle, socket_descriptor, length,
                                    total_segments);
     EXPECT_TRUE(memory.Unmap());
     memory.Close();
   }
 
-  void NotifyRendererStreamVolume(int stream_id, double volume) {
-    renderer_->NotifyStreamVolume(stream_id, volume);
-  }
-
-  void NotifyRendererStreamStateChanged(
-      int stream_id,
-      media::AudioInputIPCDelegateState state) {
-    renderer_->NotifyStreamStateChanged(stream_id, state);
+  void NotifyRendererStreamError(int stream_id) {
+    renderer_->NotifyStreamError(stream_id);
   }
 
   MockRenderer* renderer_;
 };
 
 class MockAudioInputController : public AudioInputController {
  public:
   MockAudioInputController(
       scoped_refptr<base::SingleThreadTaskRunner> task_runner,
       AudioInputController::SyncWriter* writer,
@@ skipping 166 matching lines @@
   airh_->OnMessageReceived(AudioInputHostMsg_CreateStream(
       kStreamId, kRenderFrameId, session_id, DefaultConfig()));
 
   base::RunLoop().RunUntilIdle();
   EXPECT_CALL(*controller_factory_.controller(0), Close(_));
 }
 
 // If authorization hasn't been granted, only reply with and error and do
 // nothing else.
 TEST_F(AudioInputRendererHostTest, CreateWithoutAuthorization_Error) {
-  EXPECT_CALL(renderer_,
-              NotifyStreamStateChanged(
-                  kStreamId, media::AUDIO_INPUT_IPC_DELEGATE_STATE_ERROR));
+  EXPECT_CALL(renderer_, NotifyStreamError(kStreamId));
 
   int session_id = 0;
   airh_->OnMessageReceived(AudioInputHostMsg_CreateStream(
       kStreamId, kRenderFrameId, session_id, DefaultConfig()));
   base::RunLoop().RunUntilIdle();
 }
 
 // Like CreateWithDefaultDevice but with a nondefault device.
 TEST_F(AudioInputRendererHostTest, CreateWithNonDefaultDevice) {
   int session_id = Open("Nondefault device", GetRawNondefaultId());
@@ skipping 99 matching lines @@
   base::RunLoop().RunUntilIdle();
 }
 
 // Checks that a stream_id cannot be reused.
 TEST_F(AudioInputRendererHostTest, CreateTwice_Error) {
   int session_id =
       Open("Default device", media::AudioDeviceDescription::kDefaultDeviceId);
 
   EXPECT_CALL(renderer_,
               NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount));
-  EXPECT_CALL(renderer_,
-              NotifyStreamStateChanged(
-                  kStreamId, media::AUDIO_INPUT_IPC_DELEGATE_STATE_ERROR));
+  EXPECT_CALL(renderer_, NotifyStreamError(kStreamId));
   EXPECT_CALL(controller_factory_, ControllerCreated());
 
   airh_->OnMessageReceived(AudioInputHostMsg_CreateStream(
       kStreamId, kRenderFrameId, session_id, DefaultConfig()));
   airh_->OnMessageReceived(AudioInputHostMsg_CreateStream(
       kStreamId, kRenderFrameId, session_id, DefaultConfig()));
   base::RunLoop().RunUntilIdle();
 
   EXPECT_CALL(*controller_factory_.controller(0), Close(_));
 }
@@ skipping 44 matching lines @@
 
   EXPECT_CALL(renderer_,
               NotifyStreamCreated(kStreamId, _, _, _, kSharedMemoryCount));
   EXPECT_CALL(controller_factory_, ControllerCreated());
 
   airh_->OnMessageReceived(AudioInputHostMsg_CreateStream(
       kStreamId, kRenderFrameId, session_id, DefaultConfig()));
 
   base::RunLoop().RunUntilIdle();
   EXPECT_CALL(*controller_factory_.controller(0), Close(_));
-  EXPECT_CALL(renderer_,
-              NotifyStreamStateChanged(
-                  kStreamId, media::AUDIO_INPUT_IPC_DELEGATE_STATE_ERROR));
+  EXPECT_CALL(renderer_, NotifyStreamError(kStreamId));
 
   controller_factory_.controller(0)->handler()->OnError(
       controller_factory_.controller(0), AudioInputController::UNKNOWN_ERROR);
 
   // Check Close expectation before the destructor.
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClear(controller_factory_.controller(0));
 }
 
 // Checks that tab capture streams can be created.
@@ skipping 14 matching lines @@
   EXPECT_CALL(controller_factory_, ControllerCreated());
 
   airh_->OnMessageReceived(AudioInputHostMsg_CreateStream(
       kStreamId, kRenderFrameId, session_id, DefaultConfig()));
   base::RunLoop().RunUntilIdle();
 
   EXPECT_CALL(*controller_factory_.controller(0), Close(_));
 }
 
 }  // namespace content