Index: media/audio/cras/cras_unified_unittest.cc |
diff --git a/media/audio/cras/cras_unified_unittest.cc b/media/audio/cras/cras_unified_unittest.cc |
index 040192af726b64765bf05ef78d2508843e8ce710..01bbe138100ec3979d9bc04779c2d1ee173bd747 100644 |
--- a/media/audio/cras/cras_unified_unittest.cc |
+++ b/media/audio/cras/cras_unified_unittest.cc |
@@ -8,11 +8,16 @@ |
#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 "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; |
@@ -41,8 +46,10 @@ class MockAudioManagerCras : public AudioManagerCras { |
MOCK_METHOD0(HasAudioInputDevices, bool()); |
MOCK_METHOD1(MakeLinearOutputStream, AudioOutputStream*( |
const AudioParameters& params)); |
- MOCK_METHOD1(MakeLowLatencyOutputStream, AudioOutputStream*( |
- const AudioParameters& params)); |
+ MOCK_METHOD3(MakeLowLatencyOutputStream, |
DaleCurtis
2014/01/10 19:44:14
I'm surprised this was broken... I guess we're not
|
+ AudioOutputStream*(const AudioParameters& params, |
+ const std::string& device_id, |
+ const std::string& input_device_id)); |
MOCK_METHOD2(MakeLinearOutputStream, AudioInputStream*( |
const AudioParameters& params, const std::string& device_id)); |
MOCK_METHOD2(MakeLowLatencyInputStream, AudioInputStream*( |