diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 22:49:46 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 22:49:46 +0000 |
| commit | b8a9c3806d7245a18dada4b0e0337869fbc1a88d (patch) | |
| tree | 6832b1a19a8e07ecf2aec6a9efa982bb2cfd82fd /ui/app_list | |
| parent | 6e41a014f7c03e899cb50422dfe627f459fdc63c (diff) | |
| download | chromium_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 'ui/app_list')
| -rw-r--r-- | ui/app_list/app_list.gyp | 1 | ||||
| -rw-r--r-- | ui/app_list/test/app_list_test_suite.cc | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp index c40236c..7fc5406 100644 --- a/ui/app_list/app_list.gyp +++ b/ui/app_list/app_list.gyp @@ -76,7 +76,6 @@ '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', '../compositor/compositor.gyp:compositor', - '../compositor/compositor.gyp:compositor_test_support', '../views/views.gyp:views', '../views/views.gyp:views_test_support', 'app_list', 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(); |