diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 13:49:35 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 13:49:35 +0000 |
| commit | 5c975ed62853fee34c8600cd47138816ee936fe0 (patch) | |
| tree | 646c5a923876ce914b6110c7b71c4e8f5721ad35 /views/run_all_unittests.cc | |
| parent | c144060968bce7873e4079bd2293272fe03b520f (diff) | |
| download | chromium_src-5c975ed62853fee34c8600cd47138816ee936fe0.zip chromium_src-5c975ed62853fee34c8600cd47138816ee936fe0.tar.gz chromium_src-5c975ed62853fee34c8600cd47138816ee936fe0.tar.bz2 | |
Fix up compositor mocking.
Two changes:
a) detangle the mock compositor from compositor_test_support
a) pull in compositor when using a mock compositor
Rationale:
a) this target was meant to support using use_webkit_compositor=1 when WK isn't initialized; sometimes we will want to use the mock compositor when WK is initialized
b) we can imagine scenarios where we want to switch between mock and real compositors in the same executable, and it's one less target to update
BUG=101477
TEST=bots stay green
Review URL: http://codereview.chromium.org/8395043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/run_all_unittests.cc')
| -rw-r--r-- | views/run_all_unittests.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/views/run_all_unittests.cc b/views/run_all_unittests.cc index 631db9e..20522efe 100644 --- a/views/run_all_unittests.cc +++ b/views/run_all_unittests.cc @@ -6,6 +6,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" #include "ui/gfx/compositor/compositor_test_support.h" +#include "ui/gfx/test/gfx_test_utils.h" #include "views/view.h" class ViewTestSuite : public base::TestSuite { @@ -20,7 +21,7 @@ class ViewTestSuite : public base::TestSuite { ui::ResourceBundle::InitSharedInstance("en-US"); ui::CompositorTestSupport::Initialize(); - ui::CompositorTestSupport::SetupMockCompositor(); + ui::gfx_test_utils::SetupTestCompositor(); } virtual void Shutdown() { |