diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 22:52:56 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 22:52:56 +0000 |
| commit | 2d82dcf22cddc77a40166322edab77dc33954e73 (patch) | |
| tree | af39277a75ea30040161b4f7f9eb07bcee95eb7e /chrome/chrome_tests.gypi | |
| parent | bbe8709f0bf10c10beebd86d85ed18cd5ff20a96 (diff) | |
| download | chromium_src-2d82dcf22cddc77a40166322edab77dc33954e73.zip chromium_src-2d82dcf22cddc77a40166322edab77dc33954e73.tar.gz chromium_src-2d82dcf22cddc77a40166322edab77dc33954e73.tar.bz2 | |
Revert 113676 - Attempt 2 at : Makes tests either use mock compositor or mock
WebGraphicsContext3D depending upon which compositor we're
running. This is needed to enable ui tests on the bots.
I reverted first attempt as it broke some browser_tests. I've
straightened that out in another patch, so this should be good go
again. TBR since it's the same patch as before.
BUG=104360
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8889022
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/8873037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index c8b3b0b..c329517 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -65,6 +65,8 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', + '../ui/gfx/compositor/compositor.gyp:test_compositor', + '../ui/gfx/compositor/compositor.gyp:compositor_test_support', ], 'export_dependent_settings': [ 'renderer', @@ -277,12 +279,6 @@ ['exclude', 'test/base/ui_test_utils_win.cc'], ], }], - ['use_webkit_compositor==0', { - 'dependencies': [ - '../ui/gfx/compositor/compositor.gyp:compositor_test_support', - '../ui/gfx/compositor/compositor.gyp:test_compositor', - ], - }], ], }, { |