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

Unified Diff: talk/media/devices/devicemanager_unittest.cc

Issue 1588453005: Eliminate defines in talk/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Excluding iOS from converted OSX defines Created 4 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
« no previous file with comments | « talk/media/devices/devicemanager.cc ('k') | talk/media/devices/fakedevicemanager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/devices/devicemanager_unittest.cc
diff --git a/talk/media/devices/devicemanager_unittest.cc b/talk/media/devices/devicemanager_unittest.cc
index ead01842e0d09f31e31d8f35752e7e7d7a26dfc2..606a05e7c34d1ab34e870fd5c832eac140b4852a 100644
--- a/talk/media/devices/devicemanager_unittest.cc
+++ b/talk/media/devices/devicemanager_unittest.cc
@@ -48,10 +48,10 @@
#include "webrtc/base/stream.h"
#include "webrtc/base/windowpickerfactory.h"
-#ifdef LINUX
+#ifdef WEBRTC_LINUX
// TODO(juberti): Figure out why this doesn't compile on Windows.
#include "webrtc/base/fileutils_mock.h"
-#endif // LINUX
+#endif // WEBRTC_LINUX
using rtc::Pathname;
using rtc::FileTimeType;
@@ -285,7 +285,7 @@ TEST(DeviceManagerTest, VerifyFilterDevices) {
arraysize(kDevicesName)));
}
-#ifdef LINUX
+#ifdef WEBRTC_LINUX
class FakeV4LLookup : public cricket::V4LLookup {
public:
explicit FakeV4LLookup(std::vector<std::string> device_paths)
@@ -377,7 +377,7 @@ TEST(DeviceManagerTest, GetVideoCaptureDevices_KUnknown) {
EXPECT_EQ("/dev/video0", video_ins.at(0).name);
EXPECT_EQ("/dev/video5", video_ins.at(1).name);
}
-#endif // LINUX
+#endif // WEBRTC_LINUX
// TODO(noahric): These are flaky on windows on headless machines.
#ifndef WIN32
« no previous file with comments | « talk/media/devices/devicemanager.cc ('k') | talk/media/devices/fakedevicemanager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698