Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Unified Diff: media/audio/audio_output_proxy_unittest.cc

Issue 9255017: Add thread safety to AudioManagerBase to protect access to the audio thread member variable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix style issue Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/audio_output_proxy.cc ('k') | media/audio/linux/alsa_output.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_proxy_unittest.cc
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index b2ff1a915a50a3bf6b3325a90c2d9d1239a80740..957e77aac2287c9ce16c954d9d710fbe56c1ee94 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/message_loop.h"
+#include "base/message_loop_proxy.h"
#include "base/threading/platform_thread.h"
#include "media/audio/audio_output_dispatcher.h"
#include "media/audio/audio_output_proxy.h"
@@ -50,7 +51,7 @@ class MockAudioManager : public AudioManager {
MOCK_METHOD0(UnMuteAll, void());
MOCK_METHOD0(CanShowAudioInputSettings, bool());
MOCK_METHOD0(ShowAudioInputSettings, void());
- MOCK_METHOD0(GetMessageLoop, MessageLoop*());
+ MOCK_METHOD0(GetMessageLoop, scoped_refptr<base::MessageLoopProxy>());
MOCK_METHOD1(GetAudioInputDeviceNames, void(
media::AudioDeviceNames* device_name));
MOCK_METHOD0(IsRecordingInProcess, bool());
@@ -69,7 +70,7 @@ class AudioOutputProxyTest : public testing::Test {
virtual void SetUp() {
MockAudioManager* manager = new MockAudioManager();
EXPECT_CALL(*manager, GetMessageLoop())
- .WillRepeatedly(Return(&message_loop_));
+ .WillRepeatedly(Return(message_loop_.message_loop_proxy()));
manager_ = manager;
InitDispatcher(base::TimeDelta::FromMilliseconds(kTestCloseDelayMs));
}
« no previous file with comments | « media/audio/audio_output_proxy.cc ('k') | media/audio/linux/alsa_output.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698