| commit | 2f81e7ef3dec3d7998bc76e0821bef6b56698d9b | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Thu Nov 29 00:04:54 2012 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Thu Nov 29 00:04:54 2012 |
| tree | 371bce5a444699ecbeb462bcf25a5c11c5654a88 | |
| parent | 758b4ea6ba8cc780e7f664d4140a0ef39c59fa83 [diff] [blame] |
Revert 170082 - Remove compositor_test_support It is not needed anymore after https://codereview.chromium.org/11415089/ BUG=159278 Review URL: https://chromiumcodereview.appspot.com/11419166 [email protected] Review URL: https://codereview.chromium.org/11418222 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170101 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc index 8cd5d6f..2cfaf52 100644 --- a/ash/test/test_suite.cc +++ b/ash/test/test_suite.cc
@@ -10,6 +10,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" #include "ui/compositor/compositor_setup.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/gfx/gfx_paths.h" #if defined(OS_MACOSX) @@ -35,10 +36,12 @@ // Force unittests to run using en-US so if we test against string // output, it'll pass regardless of the system language. ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); + ui::CompositorTestSupport::Initialize(); ui::SetupTestCompositor(); } void AuraShellTestSuite::Shutdown() { + ui::CompositorTestSupport::Terminate(); ui::ResourceBundle::CleanupSharedInstance(); base::TestSuite::Shutdown(); }