commit c20baf6067996003abb9608e6b1271df6e2d34c3
author Alex Konradi <akonradi@google.com> Thu Dec 03 16:30:34 2020
committer Commit Bot <commit-bot@chromium.org> Mon Dec 07 08:19:50 2020
tree 88034f2fd3beeadf4079706453896d5ce51b414c
parent 47fa08f90d6b145d32e2b4ab860ddd75a2336caf

Remove nesting of Naggy/Strict/NiceMock

This will soon become a compile-time error. Fix class hierarchies that
wrap StrictMock in a NiceMock or vice-versa by removing redundant
wrappings and removing inheritance from Nice/StrictMock and fixing the
call sites as appropriate.

Bug: b/173702213
Change-Id: Ic90b1f270c180f7308f40e52e358a8f6a6baad86
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196461
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32783}

api/voip/voip_engine_factory_unittest.cc

diff --git a/api/voip/voip_engine_factory_unittest.cc b/api/voip/voip_engine_factory_unittest.cc
index d0b8438..84b474f 100644
--- a/api/voip/voip_engine_factory_unittest.cc
+++ b/api/voip/voip_engine_factory_unittest.cc
@@ -28,7 +28,7 @@
   config.decoder_factory = new rtc::RefCountedObject<MockAudioDecoderFactory>();
   config.task_queue_factory = CreateDefaultTaskQueueFactory();
   config.audio_processing =
-      new rtc::RefCountedObject<test::MockAudioProcessing>();
+      new rtc::RefCountedObject<testing::NiceMock<test::MockAudioProcessing>>();
   config.audio_device_module = test::MockAudioDeviceModule::CreateNice();
 
   auto voip_engine = CreateVoipEngine(std::move(config));

audio/audio_receive_stream_unittest.cc

diff --git a/audio/audio_receive_stream_unittest.cc b/audio/audio_receive_stream_unittest.cc
index f0f150a..fcd691e 100644
--- a/audio/audio_receive_stream_unittest.cc
+++ b/audio/audio_receive_stream_unittest.cc
@@ -36,6 +36,7 @@
 
 using ::testing::_;
 using ::testing::FloatEq;
+using ::testing::NiceMock;
 using ::testing::Return;
 
 AudioDecodingCallStats MakeAudioDecodeStatsForTest() {
@@ -86,7 +87,7 @@
     config.audio_processing =
         use_null_audio_processing
             ? nullptr
-            : new rtc::RefCountedObject<MockAudioProcessing>();
+            : new rtc::RefCountedObject<NiceMock<MockAudioProcessing>>();
     config.audio_device_module =
         new rtc::RefCountedObject<testing::NiceMock<MockAudioDeviceModule>>();
     audio_state_ = AudioState::Create(config);

audio/audio_send_stream_unittest.cc

diff --git a/audio/audio_send_stream_unittest.cc b/audio/audio_send_stream_unittest.cc
index b91296e..f76a8fa 100644
--- a/audio/audio_send_stream_unittest.cc
+++ b/audio/audio_send_stream_unittest.cc
@@ -48,6 +48,7 @@
 using ::testing::InSequence;
 using ::testing::Invoke;
 using ::testing::Ne;
+using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::StrEq;
 
@@ -153,7 +154,7 @@
         audio_processing_(
             use_null_audio_processing
                 ? nullptr
-                : new rtc::RefCountedObject<MockAudioProcessing>()),
+                : new rtc::RefCountedObject<NiceMock<MockAudioProcessing>>()),
         bitrate_allocator_(&limit_observer_),
         worker_queue_(task_queue_factory_->CreateTaskQueue(
             "ConfigHelper_worker_queue",

audio/voip/test/voip_core_unittest.cc

diff --git a/audio/voip/test/voip_core_unittest.cc b/audio/voip/test/voip_core_unittest.cc
index 8ab67b7..f7a82f9 100644
--- a/audio/voip/test/voip_core_unittest.cc
+++ b/audio/voip/test/voip_core_unittest.cc
@@ -39,7 +39,7 @@
     auto encoder_factory = CreateBuiltinAudioEncoderFactory();
     auto decoder_factory = CreateBuiltinAudioDecoderFactory();
     rtc::scoped_refptr<AudioProcessing> audio_processing =
-        new rtc::RefCountedObject<test::MockAudioProcessing>();
+        new rtc::RefCountedObject<NiceMock<test::MockAudioProcessing>>();
 
     auto process_thread = std::make_unique<NiceMock<MockProcessThread>>();
     // Hold the pointer to use for testing.

call/call_unittest.cc

diff --git a/call/call_unittest.cc b/call/call_unittest.cc
index e165107..b6be941 100644
--- a/call/call_unittest.cc
+++ b/call/call_unittest.cc
@@ -41,6 +41,7 @@
 
 using ::testing::_;
 using ::testing::Contains;
+using ::testing::NiceMock;
 using ::testing::StrictMock;
 
 struct CallHelper {
@@ -52,7 +53,8 @@
     audio_state_config.audio_processing =
         use_null_audio_processing
             ? nullptr
-            : new rtc::RefCountedObject<webrtc::test::MockAudioProcessing>();
+            : new rtc::RefCountedObject<
+                  NiceMock<webrtc::test::MockAudioProcessing>>();
     audio_state_config.audio_device_module =
         new rtc::RefCountedObject<webrtc::test::MockAudioDeviceModule>();
     webrtc::Call::Config config(&event_log_);

modules/audio_processing/include/mock_audio_processing.h

diff --git a/modules/audio_processing/include/mock_audio_processing.h b/modules/audio_processing/include/mock_audio_processing.h
index 2055f7e..db9ab97 100644
--- a/modules/audio_processing/include/mock_audio_processing.h
+++ b/modules/audio_processing/include/mock_audio_processing.h
@@ -67,7 +67,7 @@
   MOCK_METHOD(bool, ActiveProcessing, (), (const, override));
 };
 
-class MockAudioProcessing : public ::testing::NiceMock<AudioProcessing> {
+class MockAudioProcessing : public AudioProcessing {
  public:
   MockAudioProcessing() {}