summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-11 23:55:08 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-11 23:55:08 +0000
commit997c7122e88f4420a822324f48b9ef731a130d87 (patch)
treedb9c62485678c7904342fa3067a41c65cce2e80f /media/media.gyp
parentcb65ab439b9ed8b66d9eeeb165fd17862255b315 (diff)
downloadchromium_src-997c7122e88f4420a822324f48b9ef731a130d87.zip
chromium_src-997c7122e88f4420a822324f48b9ef731a130d87.tar.gz
chromium_src-997c7122e88f4420a822324f48b9ef731a130d87.tar.bz2
Revert the "out-of-lining of test code" change within src/media
to see if it fixes the gmock crashes we've been seeing since the change has been made. The original change was split between r74660, r74168, r74059 Review URL: http://codereview.chromium.org/6473006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp2
1 files changed, 0 insertions, 2 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 2e6e613..b2d8990 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -419,8 +419,6 @@
'base/mock_filter_host.h',
'base/mock_filters.cc',
'base/mock_filters.h',
- 'video/video_mock_objects.cc',
- 'video/video_mock_objects.h',
],
},
{