From e1a50e5a8ac0a5b1947ada5bef9355939d61f076 Mon Sep 17 00:00:00 2001 From: "posciak@chromium.org" Date: Fri, 20 Dec 2013 12:07:42 +0000 Subject: Fix CRAS unittests compile break after r238637. Update CRAS unittests to pass the new audio log factory argument introduced to AudioManager's constructor to make media_unittests compile again. BUG=None TEST=Build media_unittests for CrOS, run CRAS tests. Review URL: https://codereview.chromium.org/116653003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242067 0039d316-1c4b-4281-b951-d872f2087c98 --- media/audio/cras/cras_input_unittest.cc | 6 ++++++ media/audio/cras/cras_unified_unittest.cc | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'media') diff --git a/media/audio/cras/cras_input_unittest.cc b/media/audio/cras/cras_input_unittest.cc index 8f17c79..03c89b0 100644 --- a/media/audio/cras/cras_input_unittest.cc +++ b/media/audio/cras/cras_input_unittest.cc @@ -11,6 +11,7 @@ #include "base/time/time.h" #include "media/audio/cras/audio_manager_cras.h" #include "media/audio/cras/cras_input.h" +#include "media/audio/fake_audio_log_factory.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -31,6 +32,8 @@ class MockAudioInputCallback : public AudioInputStream::AudioInputCallback { class MockAudioManagerCrasInput : public AudioManagerCras { public: + MockAudioManagerCrasInput() : AudioManagerCras(&fake_audio_log_factory_) {} + // We need to override this function in order to skip checking the number // of active output streams. It is because the number of active streams // is managed inside MakeAudioInputStream, and we don't use @@ -39,6 +42,9 @@ class MockAudioManagerCrasInput : public AudioManagerCras { DCHECK(stream); delete stream; } + + private: + FakeAudioLogFactory fake_audio_log_factory_; }; class CrasInputStreamTest : public testing::Test { diff --git a/media/audio/cras/cras_unified_unittest.cc b/media/audio/cras/cras_unified_unittest.cc index 7083eca..040192a 100644 --- a/media/audio/cras/cras_unified_unittest.cc +++ b/media/audio/cras/cras_unified_unittest.cc @@ -9,6 +9,7 @@ #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 "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -33,6 +34,8 @@ class MockAudioSourceCallback : public AudioOutputStream::AudioSourceCallback { class MockAudioManagerCras : public AudioManagerCras { public: + MockAudioManagerCras() : AudioManagerCras(&fake_audio_log_factory_) {} + MOCK_METHOD0(Init, void()); MOCK_METHOD0(HasAudioOutputDevices, bool()); MOCK_METHOD0(HasAudioInputDevices, bool()); @@ -53,6 +56,9 @@ class MockAudioManagerCras : public AudioManagerCras { DCHECK(stream); delete stream; } + + private: + FakeAudioLogFactory fake_audio_log_factory_; }; class CrasUnifiedStreamTest : public testing::Test { -- cgit v1.1