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

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

Issue 8222028: Use WebKit compositor in ui::Layer (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebase Created 9 years, 2 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/aura/aura.gyp ('k') | ui/aura_shell/aura_shell.gyp » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/file_path.h" 7 #include "base/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/gfx/compositor/compositor_test_support.h"
12 #include "ui/gfx/gfx_paths.h" 13 #include "ui/gfx/gfx_paths.h"
13 #include "ui/gfx/gl/gl_implementation.h" 14 #include "ui/gfx/gl/gl_implementation.h"
14 15
15 namespace aura { 16 namespace aura {
16 namespace test { 17 namespace test {
17 18
18 AuraTestSuite::AuraTestSuite(int argc, char** argv) 19 AuraTestSuite::AuraTestSuite(int argc, char** argv)
19 : TestSuite(argc, argv) {} 20 : TestSuite(argc, argv) {}
20 21
21 void AuraTestSuite::Initialize() { 22 void AuraTestSuite::Initialize() {
22 base::TestSuite::Initialize(); 23 base::TestSuite::Initialize();
23 24
24 gfx::RegisterPathProvider(); 25 gfx::RegisterPathProvider();
25 ui::RegisterPathProvider(); 26 ui::RegisterPathProvider();
26 27
27 // Force unittests to run using en-US so if we test against string 28 // Force unittests to run using en-US so if we test against string
28 // output, it'll pass regardless of the system language. 29 // output, it'll pass regardless of the system language.
29 ui::ResourceBundle::InitSharedInstance("en-US"); 30 ui::ResourceBundle::InitSharedInstance("en-US");
31 ui::CompositorTestSupport::Initialize();
30 } 32 }
31 33
32 void AuraTestSuite::Shutdown() { 34 void AuraTestSuite::Shutdown() {
35 ui::CompositorTestSupport::Terminate();
33 ui::ResourceBundle::CleanupSharedInstance(); 36 ui::ResourceBundle::CleanupSharedInstance();
34 37
35 base::TestSuite::Shutdown(); 38 base::TestSuite::Shutdown();
36 } 39 }
37 40
38 } // namespace test 41 } // namespace test
39 } // namespace aura 42 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura_shell/aura_shell.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698