diff options
| author | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-23 21:05:58 +0000 |
|---|---|---|
| committer | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-23 21:05:58 +0000 |
| commit | 5294a92e5f0f2ae8e8eb521d85bba6803dab6138 (patch) | |
| tree | 861df051d1a4eec15f57b82a6c7eb3f7b929f7b4 /ash/test | |
| parent | 59514bfb9f9ff108b3cf0a3f9584e44b440e739d (diff) | |
| download | chromium_src-5294a92e5f0f2ae8e8eb521d85bba6803dab6138.zip chromium_src-5294a92e5f0f2ae8e8eb521d85bba6803dab6138.tar.gz chromium_src-5294a92e5f0f2ae8e8eb521d85bba6803dab6138.tar.bz2 | |
Revert 169355 - Remove compositor_test_support
It is not needed anymore after https://codereview.chromium.org/11415089/
BUG=159278
Review URL: https://chromiumcodereview.appspot.com/11348171
TBR=piman@chromium.org
Review URL: https://codereview.chromium.org/11308187
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/test_suite.cc | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ void AuraShellTestSuite::Initialize() { // 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(); } |