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

Unified Diff: media/audio/cras/cras_input_unittest.cc

Issue 132773002: Fix chromeos=1 so Pulse is preferred when use_cras=0. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove alsa_util.h dependency. Created 6 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
Index: media/audio/cras/cras_input_unittest.cc
diff --git a/media/audio/cras/cras_input_unittest.cc b/media/audio/cras/cras_input_unittest.cc
index 03c89b0e3b36a84523c609e289695b05f5f99d41..77f951cbb28c464277839d61df57b06c91c208d4 100644
--- a/media/audio/cras/cras_input_unittest.cc
+++ b/media/audio/cras/cras_input_unittest.cc
@@ -2,19 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <unistd.h>
-
#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_input.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_input.h"
+#endif
dgreid 2014/01/10 19:56:25 This works, we should probably wrap the defines in
DaleCurtis 2014/01/10 20:00:18 Agreed, this isn't first time this issue has cropp
+
using testing::_;
using testing::AtLeast;
using testing::Ge;

Powered by Google App Engine
This is Rietveld 408576698