diff options
| -rw-r--r-- | media/audio/audio_input_controller_unittest.cc | 9 | ||||
| -rw-r--r-- | tools/heapcheck/suppressions.txt | 14 |
2 files changed, 6 insertions, 17 deletions
diff --git a/media/audio/audio_input_controller_unittest.cc b/media/audio/audio_input_controller_unittest.cc index be6f8f3..e0850c4 100644 --- a/media/audio/audio_input_controller_unittest.cc +++ b/media/audio/audio_input_controller_unittest.cc @@ -66,7 +66,7 @@ class AudioInputControllerTest : public testing::Test { virtual ~AudioInputControllerTest() {} protected: - MessageLoopForIO message_loop_; + MessageLoop message_loop_; private: DISALLOW_COPY_AND_ASSIGN(AudioInputControllerTest); @@ -78,7 +78,7 @@ TEST_F(AudioInputControllerTest, CreateAndClose) { // OnCreated() will be posted once. EXPECT_CALL(event_handler, OnCreated(NotNull())) - .WillOnce(QuitMessageLoop(message_loop_.message_loop_proxy())); + .WillOnce(QuitMessageLoop(&message_loop_)); scoped_ptr<AudioManager> audio_manager(AudioManager::Create()); AudioParameters params(AudioParameters::AUDIO_MOCK, kChannelLayout, @@ -87,6 +87,9 @@ TEST_F(AudioInputControllerTest, CreateAndClose) { AudioInputController::Create(audio_manager.get(), &event_handler, params); ASSERT_TRUE(controller.get()); + // Wait for OnCreated() to fire. + message_loop_.Run(); + // Close the AudioInputController synchronously. CloseAudioController(controller); } @@ -154,7 +157,7 @@ TEST_F(AudioInputControllerTest, RecordAndError) { // controller is in a recording state. EXPECT_CALL(event_handler, OnError(NotNull(), 0)) .Times(Exactly(1)) - .WillOnce(QuitMessageLoop(message_loop_.message_loop_proxy())); + .WillOnce(QuitMessageLoop(&message_loop_)); scoped_ptr<AudioManager> audio_manager(AudioManager::Create()); AudioParameters params(AudioParameters::AUDIO_MOCK, kChannelLayout, diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt index ed6fd8c..361b9ee 100644 --- a/tools/heapcheck/suppressions.txt +++ b/tools/heapcheck/suppressions.txt @@ -1796,17 +1796,3 @@ ... fun:SelectFileDialogExtensionTest_SelfDeleting_Test::TestBody } -{ - bug_119714_a - Heapcheck:Leak - ... - fun:*AudioInputControllerTest_CreateAndClose_Test* -} -{ - # This should be removed soon! It's a pretty broad suppression. - bug_119714_b - Heapcheck:Leak - fun:MessageLoop::MessageLoop - fun:base::Thread::ThreadMain - fun:base::::ThreadFunc -} |