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

Side by Side Diff: ui/aura_shell/test_suite.cc

Issue 8360018: Revert 106606 - Use WebKit compositor in ui::Layer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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_shell/examples/aura_shell_main.cc ('k') | ui/gfx/compositor/DEPS » ('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_shell/test_suite.h" 5 #include "ui/aura_shell/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"
13 #include "ui/gfx/gfx_paths.h" 12 #include "ui/gfx/gfx_paths.h"
14 #include "ui/gfx/gl/gl_implementation.h" 13 #include "ui/gfx/gl/gl_implementation.h"
15 14
16 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv) 15 AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv)
17 : TestSuite(argc, argv) {} 16 : TestSuite(argc, argv) {}
18 17
19 void AuraShellTestSuite::Initialize() { 18 void AuraShellTestSuite::Initialize() {
20 #if defined(OS_LINUX) 19 #if defined(OS_LINUX)
21 gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL); 20 gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);
22 #endif 21 #endif
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::InitSharedInstance("en-US"); 29 ui::ResourceBundle::InitSharedInstance("en-US");
31 ui::CompositorTestSupport::Initialize();
32 } 30 }
33 31
34 void AuraShellTestSuite::Shutdown() { 32 void AuraShellTestSuite::Shutdown() {
35 ui::CompositorTestSupport::Terminate();
36 ui::ResourceBundle::CleanupSharedInstance(); 33 ui::ResourceBundle::CleanupSharedInstance();
37 34
38 base::TestSuite::Shutdown(); 35 base::TestSuite::Shutdown();
39 } 36 }
OLDNEW
« no previous file with comments | « ui/aura_shell/examples/aura_shell_main.cc ('k') | ui/gfx/compositor/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698