Fix chromeos=1 so Pulse is preferred when use_cras=0.

media/audio/cras/cras_unified_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/synchronization/waitable_event.h"
 #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;
 using testing::Return;
 using testing::SetArgumentPointee;
 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_METHOD3(MakeLowLatencyOutputStream,

[DaleCurtis, 2014/01/10 19:44:14]

I'm surprised this was broken... I guess we're not building media_unittests
anywhere use_cras=1 :(

+               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*(
       const AudioParameters& params, const std::string& device_id));
 
   // We need to override this function in order to skip the checking the number
   // of active output streams. It is because the number of active streams
   // is managed inside MakeAudioOutputStream, and we don't use
   // MakeAudioOutputStream to create the stream in the tests.
   virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE {
@@ skipping 98 matching lines @@
 
   // Wait for samples to be captured.
   EXPECT_TRUE(event.TimedWait(TestTimeouts::action_timeout()));
 
   test_stream->Stop();
 
   test_stream->Close();
 }
 
 }  // namespace media