summaryrefslogtreecommitdiffstats
path: root/ash/test/test_suite.cc
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-28 22:49:46 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-28 22:49:46 +0000
commitb8a9c3806d7245a18dada4b0e0337869fbc1a88d (patch)
tree6832b1a19a8e07ecf2aec6a9efa982bb2cfd82fd /ash/test/test_suite.cc
parent6e41a014f7c03e899cb50422dfe627f459fdc63c (diff)
downloadchromium_src-b8a9c3806d7245a18dada4b0e0337869fbc1a88d.zip
chromium_src-b8a9c3806d7245a18dada4b0e0337869fbc1a88d.tar.gz
chromium_src-b8a9c3806d7245a18dada4b0e0337869fbc1a88d.tar.bz2
Remove compositor_test_support
It is not needed anymore after https://codereview.chromium.org/11415089/ BUG=159278 Review URL: https://chromiumcodereview.appspot.com/11419166 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/test_suite.cc')
-rw-r--r--ash/test/test_suite.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc
index 2cfaf52..8cd5d6f 100644
--- a/ash/test/test_suite.cc
+++ b/ash/test/test_suite.cc
@@ -10,7 +10,6 @@
#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)
@@ -36,12 +35,10 @@ 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();
}