media: Cleanup uninteresting mock function calls

  "Uninteresting mock function call" warning in the log.

Bug: b/124282902
Test: Passes capture_unittests and there is no
Change-Id: I35328b76da931f8b6963143d245c5d08fc7f4811
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1613139
Auto-Submit: Shik Chen <shik@chromium.org>
Reviewed-by: Ricky Liang <jcliang@chromium.org>
Reviewed-by: Tommi <tommi@chromium.org>
Commit-Queue: Shik Chen <shik@chromium.org>
Cr-Commit-Position: refs/heads/master@{#660342}

media/capture/video/chromeos/camera_device_delegate_unittest.cc

@@ -387,9 +387,9 @@ class CameraDeviceDelegateTest : public ::testing::Test {
     EXPECT_EQ(CameraDeviceContext::State::kStopped, GetState());
   }
 
-  unittest_internal::MockVideoCaptureClient* ResetDeviceContext() {
+  unittest_internal::NiceMockVideoCaptureClient* ResetDeviceContext() {
     auto mock_client =
-        std::make_unique<unittest_internal::MockVideoCaptureClient>();
+        std::make_unique<unittest_internal::NiceMockVideoCaptureClient>();
     auto* client_ptr = mock_client.get();
     device_context_ =
         std::make_unique<CameraDeviceContext>(std::move(mock_client));

media/capture/video/chromeos/mock_video_capture_client.h

@@ -76,6 +76,8 @@ class MockVideoCaptureClient : public VideoCaptureDevice::Client {
   base::OnceClosure quit_cb_;
 };
 
+using NiceMockVideoCaptureClient = ::testing::NiceMock<MockVideoCaptureClient>;
+
 }  // namespace unittest_internal
 }  // namespace media
 

media/capture/video/fake_video_capture_device_unittest.cc

@@ -147,7 +147,7 @@ class FakeVideoCaptureDeviceTestBase : public ::testing::Test {
   void SetUp() override { EXPECT_CALL(*client_, OnError(_, _, _)).Times(0); }
 
   std::unique_ptr<MockVideoCaptureDeviceClient> CreateClient() {
-    auto result = std::make_unique<MockVideoCaptureDeviceClient>();
+    auto result = std::make_unique<NiceMockVideoCaptureDeviceClient>();
     ON_CALL(*result, ReserveOutputBuffer(_, _, _, _))
         .WillByDefault(
             Invoke([](const gfx::Size& dimensions, VideoPixelFormat format, int,

media/capture/video/file_video_capture_device_unittest.cc

@@ -50,7 +50,8 @@ class MockImageCaptureClient {
 
 class FileVideoCaptureDeviceTest : public ::testing::Test {
  protected:
-  FileVideoCaptureDeviceTest() : client_(new MockVideoCaptureDeviceClient()) {}
+  FileVideoCaptureDeviceTest()
+      : client_(new NiceMockVideoCaptureDeviceClient()) {}
 
   void SetUp() override {
     EXPECT_CALL(*client_, OnError(_, _, _)).Times(0);
@@ -62,7 +63,7 @@ class FileVideoCaptureDeviceTest : public ::testing::Test {
 
   void TearDown() override { device_->StopAndDeAllocate(); }
 
-  std::unique_ptr<MockVideoCaptureDeviceClient> client_;
+  std::unique_ptr<NiceMockVideoCaptureDeviceClient> client_;
   MockImageCaptureClient image_capture_client_;
   std::unique_ptr<VideoCaptureDevice> device_;
   VideoCaptureFormat last_format_;

media/capture/video/linux/video_capture_device_factory_linux_unittest.cc

@@ -123,7 +123,7 @@ TEST_F(VideoCaptureDeviceFactoryLinuxTest,
   arbitrary_params.requested_format.frame_size = gfx::Size(1280, 720);
   arbitrary_params.requested_format.frame_rate = 30.0f;
   arbitrary_params.requested_format.pixel_format = PIXEL_FORMAT_I420;
-  auto client = std::make_unique<MockVideoCaptureDeviceClient>();
+  auto client = std::make_unique<NiceMockVideoCaptureDeviceClient>();
   MockVideoCaptureDeviceClient* client_ptr = client.get();
 
   base::RunLoop wait_loop;

media/capture/video/mock_video_capture_device_client.h

@@ -69,6 +69,9 @@ class MockVideoCaptureDeviceClient : public VideoCaptureDevice::Client {
                     const media::VideoFrameMetadata& additional_metadata));
 };
 
+using NiceMockVideoCaptureDeviceClient =
+    ::testing::NiceMock<MockVideoCaptureDeviceClient>;
+
 }  // namespace media
 
 #endif  // MEDIA_CAPTURE_VIDEO_MOCK_VIDEO_CAPTURE_DEVICE_CLIENT_H_

media/capture/video/video_capture_device_client_unittest.cc

@@ -27,9 +27,10 @@
 
 using ::testing::_;
 using ::testing::AtLeast;
-using ::testing::Mock;
 using ::testing::InSequence;
 using ::testing::Invoke;
+using ::testing::Mock;
+using ::testing::NiceMock;
 using ::testing::SaveArg;
 
 namespace media {
@@ -55,7 +56,7 @@ class VideoCaptureDeviceClientTest : public ::testing::Test {
     scoped_refptr<VideoCaptureBufferPoolImpl> buffer_pool(
         new VideoCaptureBufferPoolImpl(
             std::make_unique<VideoCaptureBufferTrackerFactoryImpl>(), 2));
-    auto controller = std::make_unique<MockVideoFrameReceiver>();
+    auto controller = std::make_unique<NiceMock<MockVideoFrameReceiver>>();
     receiver_ = controller.get();
     gpu_memory_buffer_manager_ =
         std::make_unique<unittest_internal::MockGpuMemoryBufferManager>();
@@ -72,7 +73,7 @@ class VideoCaptureDeviceClientTest : public ::testing::Test {
   ~VideoCaptureDeviceClientTest() override = default;
 
  protected:
-  MockVideoFrameReceiver* receiver_;
+  NiceMock<MockVideoFrameReceiver>* receiver_;
   std::unique_ptr<unittest_internal::MockGpuMemoryBufferManager>
       gpu_memory_buffer_manager_;
   std::unique_ptr<VideoCaptureDeviceClient> device_client_;

media/capture/video/video_capture_device_unittest.cc

@@ -299,7 +299,7 @@ class VideoCaptureDeviceTest
 #endif
 
   std::unique_ptr<MockVideoCaptureDeviceClient> CreateDeviceClient() {
-    auto result = std::make_unique<MockVideoCaptureDeviceClient>();
+    auto result = std::make_unique<NiceMockVideoCaptureDeviceClient>();
     ON_CALL(*result, OnError(_, _, _)).WillByDefault(Invoke(DumpError));
     EXPECT_CALL(*result, ReserveOutputBuffer(_, _, _, _)).Times(0);
     EXPECT_CALL(*result, DoOnIncomingCapturedBuffer(_, _, _, _)).Times(0);