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

Side by Side Diff: views/run_all_unittests.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/gfx/compositor/test_suite.cc ('k') | views/view_unittest.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) 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 "base/test/test_suite.h" 5 #include "base/test/test_suite.h"
6 #include "ui/base/resource/resource_bundle.h" 6 #include "ui/base/resource/resource_bundle.h"
7 #include "ui/base/ui_base_paths.h" 7 #include "ui/base/ui_base_paths.h"
8 #include "ui/gfx/compositor/compositor_test_support.h"
9 #include "views/view.h" 8 #include "views/view.h"
10 9
11 class ViewTestSuite : public base::TestSuite { 10 class ViewTestSuite : public base::TestSuite {
12 public: 11 public:
13 ViewTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} 12 ViewTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
14 13
15 protected: 14 protected:
16 virtual void Initialize() { 15 virtual void Initialize() {
17 base::TestSuite::Initialize(); 16 base::TestSuite::Initialize();
18 17
19 ui::RegisterPathProvider(); 18 ui::RegisterPathProvider();
20 ui::ResourceBundle::InitSharedInstance("en-US"); 19 ui::ResourceBundle::InitSharedInstance("en-US");
21 20
22 #if defined(OS_LINUX) 21 #if defined(OS_LINUX)
23 // Disable GPU browser compositor during unit tests. 22 // Disable GPU browser compositor during unit tests.
24 views::View::set_use_acceleration_when_possible(false); 23 views::View::set_use_acceleration_when_possible(false);
25 #endif 24 #endif
26 ui::CompositorTestSupport::Initialize();
27 }
28
29 virtual void Shutdown() {
30 ui::CompositorTestSupport::Terminate();
31 } 25 }
32 }; 26 };
33 27
34 int main(int argc, char** argv) { 28 int main(int argc, char** argv) {
35 return ViewTestSuite(argc, argv).Run(); 29 return ViewTestSuite(argc, argv).Run();
36 } 30 }
OLDNEW
« no previous file with comments | « ui/gfx/compositor/test_suite.cc ('k') | views/view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698