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

Side by Side Diff: ui/aura/test/test_suite.cc

Issue 22293003: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: UseRealGLBindings in NetInternalsTest Created 7 years, 4 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
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/aura/test/test_suite.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
11 #include "ui/base/ui_base_paths.h" 11 #include "ui/base/ui_base_paths.h"
12 #include "ui/compositor/compositor_setup.h"
13 #include "ui/gfx/gfx_paths.h" 12 #include "ui/gfx/gfx_paths.h"
14 #include "ui/gl/gl_implementation.h" 13 #include "ui/gl/gl_implementation.h"
15 14
16 namespace aura { 15 namespace aura {
17 namespace test { 16 namespace test {
18 17
19 AuraTestSuite::AuraTestSuite(int argc, char** argv) 18 AuraTestSuite::AuraTestSuite(int argc, char** argv)
20 : TestSuite(argc, argv) {} 19 : TestSuite(argc, argv) {}
21 20
22 void AuraTestSuite::Initialize() { 21 void AuraTestSuite::Initialize() {
23 base::TestSuite::Initialize(); 22 base::TestSuite::Initialize();
24 23
25 gfx::RegisterPathProvider(); 24 gfx::RegisterPathProvider();
26 ui::RegisterPathProvider(); 25 ui::RegisterPathProvider();
27 26
28 // Force unittests to run using en-US so if we test against string 27 // Force unittests to run using en-US so if we test against string
29 // output, it'll pass regardless of the system language. 28 // output, it'll pass regardless of the system language.
30 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); 29 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
31
32 ui::SetupTestCompositor();
33 } 30 }
34 31
35 void AuraTestSuite::Shutdown() { 32 void AuraTestSuite::Shutdown() {
36 ui::ResourceBundle::CleanupSharedInstance(); 33 ui::ResourceBundle::CleanupSharedInstance();
37 34
38 base::TestSuite::Shutdown(); 35 base::TestSuite::Shutdown();
39 } 36 }
40 37
41 } // namespace test 38 } // namespace test
42 } // namespace aura 39 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698