diff options
| author | jmadill <jmadill@chromium.org> | 2015-09-29 09:11:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-29 16:12:33 +0000 |
| commit | 7da345fc6c7cb4dba26b4e2bbf450b3cdb6dd889 (patch) | |
| tree | 6c38364a0066707d94a2ba5ca5a460bb45600d18 /chrome/chrome_renderer.gypi | |
| parent | 035e58eff2c08c2acf734265d58bf24db976c288 (diff) | |
| download | chromium_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 'chrome/chrome_renderer.gypi')
| -rw-r--r-- | chrome/chrome_renderer.gypi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index ec5c092..bd3f0b3 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -281,7 +281,6 @@ 'dependencies': [ 'common_net', '../components/components.gyp:dom_distiller_content_renderer', - '../media/media.gyp:media', ], }], ['disable_nacl!=1', { |