diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 14:20:31 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 14:20:31 +0000 |
| commit | 2d7b0872c81343917c37914863d47f429b3a5b68 (patch) | |
| tree | 6d1f7cc551e53d2626ff522ec46adb18da6c991c /content/test/content_test_suite.cc | |
| parent | 5c975ed62853fee34c8600cd47138816ee936fe0 (diff) | |
| download | chromium_src-2d7b0872c81343917c37914863d47f429b3a5b68.zip chromium_src-2d7b0872c81343917c37914863d47f429b3a5b68.tar.gz chromium_src-2d7b0872c81343917c37914863d47f429b3a5b68.tar.bz2 | |
Revert 107563 - 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
TBR=backer@chromium.org
Review URL: http://codereview.chromium.org/8404041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_test_suite.cc')
| -rw-r--r-- | content/test/content_test_suite.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc index 2ac62be..1307aaa 100644 --- a/content/test/content_test_suite.cc +++ b/content/test/content_test_suite.cc @@ -13,7 +13,7 @@ #include "content/test/test_content_client.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/ui_base_paths.h" -#include "ui/gfx/test/gfx_test_utils.h" +#include "ui/gfx/compositor/compositor_test_support.h" namespace { @@ -67,7 +67,7 @@ void ContentTestSuite::Initialize() { ui::RegisterPathProvider(); // Mock out the compositor on platforms that use it. - ui::gfx_test_utils::SetupTestCompositor(); + ui::CompositorTestSupport::SetupMockCompositor(); testing::TestEventListeners& listeners = testing::UnitTest::GetInstance()->listeners(); |