summaryrefslogtreecommitdiffstats
path: root/media/cast/cast_testing.gypi
diff options
context:
space:
mode:
authorjmadill <jmadill@chromium.org>2015-09-29 09:11:33 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-29 16:12:33 +0000
commit7da345fc6c7cb4dba26b4e2bbf450b3cdb6dd889 (patch)
tree6c38364a0066707d94a2ba5ca5a460bb45600d18 /media/cast/cast_testing.gypi
parent035e58eff2c08c2acf734265d58bf24db976c288 (diff)
downloadchromium_src-7da345fc6c7cb4dba26b4e2bbf450b3cdb6dd889.zip
chromium_src-7da345fc6c7cb4dba26b4e2bbf450b3cdb6dd889.tar.gz
chromium_src-7da345fc6c7cb4dba26b4e2bbf450b3cdb6dd889.tar.bz2
Revert "Re-land: Add localized default audio device names."
Seems to be causing failurs on Windows 7 Intel: http://build.chromium.org/p/chromium.gpu.fyi/builders/Win7%20Release%20%28Intel%29/builds/13657 [ RUN ] AudioManagerTest.EnumerateOutputDevices c:\b\build\slave\gpu_win_builder\build\src\media\audio\audio_manager_unittest.cc(95): error: Expected: (AudioManager::GetDefaultDeviceName()) != (it->device_name), actual: "FakeString" vs "FakeString" [ FAILED ] AudioManagerTest.EnumerateOutputDevices (0 ms) [ RUN ] AudioManagerTest.EnumerateOutputDevicesWinMMDevice c:\b\build\slave\gpu_win_builder\build\src\media\audio\audio_manager_unittest.cc(95): error: Expected: (AudioManager::GetDefaultDeviceName()) != (it->device_name), actual: "FakeString" vs "FakeString" [ FAILED ] AudioManagerTest.EnumerateOutputDevicesWinMMDevice (3 ms) BUG=497001 TBR=thakis@chromium.org,ajm@chromium.org,dalecurtis@chromium.org This reverts commit c82ba18e50843b4bfecb1238205db4c23b533d91. Review URL: https://codereview.chromium.org/1381433002 Cr-Commit-Position: refs/heads/master@{#351326}
Diffstat (limited to 'media/cast/cast_testing.gypi')
-rw-r--r--media/cast/cast_testing.gypi1
1 files changed, 0 insertions, 1 deletions
diff --git a/media/cast/cast_testing.gypi b/media/cast/cast_testing.gypi
index d45bd82..9e439e0 100644
--- a/media/cast/cast_testing.gypi
+++ b/media/cast/cast_testing.gypi
@@ -68,7 +68,6 @@
# the tools compile correctly.
'cast_tools',
'<(DEPTH)/base/base.gyp:test_support_base',
- '<(DEPTH)/media/media.gyp:media_test_support',
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',