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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/aura/test/test_suite.h" 5 #include "ui/app_list/test/app_list_test_suite.h"
6 6
7 #include "base/file_path.h" 7 #include "ui/base/ui_base_paths.h"
8 #include "base/path_service.h"
9 #include "build/build_config.h"
10 #include "ui/base/resource/resource_bundle.h" 8 #include "ui/base/resource/resource_bundle.h"
11 #include "ui/base/ui_base_paths.h"
12 #include "ui/compositor/compositor_setup.h"
13 #include "ui/compositor/test/compositor_test_support.h"
14 #include "ui/gfx/gfx_paths.h"
15 #include "ui/gl/gl_implementation.h"
16 9
17 namespace aura { 10 namespace app_list {
18 namespace test { 11 namespace test {
19 12
20 AuraTestSuite::AuraTestSuite(int argc, char** argv) 13 AppListTestSuite::AppListTestSuite(int argc, char** argv)
21 : TestSuite(argc, argv) {} 14 : TestSuite(argc, argv) {
15 }
22 16
23 void AuraTestSuite::Initialize() { 17 void AppListTestSuite::Initialize() {
24 base::TestSuite::Initialize(); 18 base::TestSuite::Initialize();
25 19
26 gfx::RegisterPathProvider();
27 ui::RegisterPathProvider(); 20 ui::RegisterPathProvider();
28 21
29 // Force unittests to run using en-US so if we test against string 22 // Force unittests to run using en-US so if we test against string
30 // output, it'll pass regardless of the system language. 23 // output, it'll pass regardless of the system language.
31 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); 24 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
32 ui::CompositorTestSupport::Initialize();
33
34 ui::SetupTestCompositor();
35 } 25 }
36 26
37 void AuraTestSuite::Shutdown() { 27 void AppListTestSuite::Shutdown() {
38 ui::CompositorTestSupport::Terminate();
39 ui::ResourceBundle::CleanupSharedInstance(); 28 ui::ResourceBundle::CleanupSharedInstance();
40 29
41 base::TestSuite::Shutdown(); 30 base::TestSuite::Shutdown();
42 } 31 }
43 32
44 } // namespace test 33 } // namespace test
45 } // namespace aura 34 } // namespace app_list
OLDNEW
« 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