From ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Fri, 8 Aug 2014 14:30:41 +0200 Subject: Update Chromium to beta version 37.0.2062.68 Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi --- chromium/media/audio/cras/cras_unified_unittest.cc | 29 ++++++++++++---------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'chromium/media/audio/cras/cras_unified_unittest.cc') diff --git a/chromium/media/audio/cras/cras_unified_unittest.cc b/chromium/media/audio/cras/cras_unified_unittest.cc index 7083eca427e..9d282bb7505 100644 --- a/chromium/media/audio/cras/cras_unified_unittest.cc +++ b/chromium/media/audio/cras/cras_unified_unittest.cc @@ -8,10 +8,17 @@ #include "base/test/test_timeouts.h" #include "base/time/time.h" #include "media/audio/cras/audio_manager_cras.h" -#include "media/audio/cras/cras_unified.h" +#include "media/audio/fake_audio_log_factory.h" +#include "media/audio/mock_audio_source_callback.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" +// cras_util.h defines custom min/max macros which break compilation, so ensure +// it's not included until last. #if avoids presubmit errors. +#if defined(USE_CRAS) +#include "media/audio/cras/cras_unified.h" +#endif + using testing::_; using testing::DoAll; using testing::InvokeWithoutArgs; @@ -21,25 +28,18 @@ using testing::StrictMock; namespace media { -class MockAudioSourceCallback : public AudioOutputStream::AudioSourceCallback { - public: - MOCK_METHOD2(OnMoreData, int(AudioBus* audio_bus, - AudioBuffersState buffers_state)); - MOCK_METHOD3(OnMoreIOData, int(AudioBus* source, - AudioBus* dest, - AudioBuffersState buffers_state)); - MOCK_METHOD1(OnError, void(AudioOutputStream* stream)); -}; - class MockAudioManagerCras : public AudioManagerCras { public: + MockAudioManagerCras() : AudioManagerCras(&fake_audio_log_factory_) {} + MOCK_METHOD0(Init, void()); MOCK_METHOD0(HasAudioOutputDevices, bool()); MOCK_METHOD0(HasAudioInputDevices, bool()); MOCK_METHOD1(MakeLinearOutputStream, AudioOutputStream*( const AudioParameters& params)); - MOCK_METHOD1(MakeLowLatencyOutputStream, AudioOutputStream*( - const AudioParameters& params)); + MOCK_METHOD2(MakeLowLatencyOutputStream, + AudioOutputStream*(const AudioParameters& params, + const std::string& device_id)); MOCK_METHOD2(MakeLinearOutputStream, AudioInputStream*( const AudioParameters& params, const std::string& device_id)); MOCK_METHOD2(MakeLowLatencyInputStream, AudioInputStream*( @@ -53,6 +53,9 @@ class MockAudioManagerCras : public AudioManagerCras { DCHECK(stream); delete stream; } + + private: + FakeAudioLogFactory fake_audio_log_factory_; }; class CrasUnifiedStreamTest : public testing::Test { -- cgit v1.2.3