Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Unified Diff: ui/app_list/test/app_list_test_suite.cc

Issue 10533032: cleanup: Remove applist v1 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/test/app_list_test_suite.h ('k') | ui/app_list/test/run_all_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/test/app_list_test_suite.cc
diff --git a/ui/aura/test/test_suite.cc b/ui/app_list/test/app_list_test_suite.cc
similarity index 50%
copy from ui/aura/test/test_suite.cc
copy to ui/app_list/test/app_list_test_suite.cc
index f74757d7f402cbc82cf1627a775aa4c6becf6558..b1c78d46292b43fc33c2a66fde2c4c4ecf2ae677 100644
--- a/ui/aura/test/test_suite.cc
+++ b/ui/app_list/test/app_list_test_suite.cc
@@ -2,44 +2,33 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/aura/test/test_suite.h"
+#include "ui/app_list/test/app_list_test_suite.h"
-#include "base/file_path.h"
-#include "base/path_service.h"
-#include "build/build_config.h"
-#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"
-#include "ui/gl/gl_implementation.h"
+#include "ui/base/resource/resource_bundle.h"
-namespace aura {
+namespace app_list {
namespace test {
-AuraTestSuite::AuraTestSuite(int argc, char** argv)
- : TestSuite(argc, argv) {}
+AppListTestSuite::AppListTestSuite(int argc, char** argv)
+ : TestSuite(argc, argv) {
+}
-void AuraTestSuite::Initialize() {
+void AppListTestSuite::Initialize() {
base::TestSuite::Initialize();
- gfx::RegisterPathProvider();
ui::RegisterPathProvider();
// 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 AuraTestSuite::Shutdown() {
- ui::CompositorTestSupport::Terminate();
+void AppListTestSuite::Shutdown() {
ui::ResourceBundle::CleanupSharedInstance();
base::TestSuite::Shutdown();
}
} // namespace test
-} // namespace aura
+} // namespace app_list
« no previous file with comments | « ui/app_list/test/app_list_test_suite.h ('k') | ui/app_list/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698