summaryrefslogtreecommitdiffstats
path: root/ui/app_list/test
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-23 18:36:56 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-23 18:36:56 +0000
commit0cec7b8f7b26499afb55009ca9d53121bacb24fe (patch)
tree6dd7218b8be844a5f8d221f4d1bd2036f81f8325 /ui/app_list/test
parentc1a04512be0d81b9971f7bfea404c0072a86071d (diff)
downloadchromium_src-0cec7b8f7b26499afb55009ca9d53121bacb24fe.zip
chromium_src-0cec7b8f7b26499afb55009ca9d53121bacb24fe.tar.gz
chromium_src-0cec7b8f7b26499afb55009ca9d53121bacb24fe.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/11348171 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/app_list/test')
-rw-r--r--ui/app_list/test/app_list_test_suite.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/ui/app_list/test/app_list_test_suite.cc b/ui/app_list/test/app_list_test_suite.cc
index e38a348..528d387 100644
--- a/ui/app_list/test/app_list_test_suite.cc
+++ b/ui/app_list/test/app_list_test_suite.cc
@@ -7,7 +7,6 @@
#include "ui/base/ui_base_paths.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/compositor/compositor_setup.h"
-#include "ui/compositor/test/compositor_test_support.h"
namespace app_list {
namespace test {
@@ -25,12 +24,10 @@ void AppListTestSuite::Initialize() {
// output, it'll pass regardless of the system language.
ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
- ui::CompositorTestSupport::Initialize();
ui::SetupTestCompositor();
}
void AppListTestSuite::Shutdown() {
- ui::CompositorTestSupport::Terminate();
ui::ResourceBundle::CleanupSharedInstance();
base::TestSuite::Shutdown();