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

Side by Side Diff: ui/views/run_all_unittests.cc

Issue 8805033: Makes tests either use mock compositor or mock WebGraphicsContext3D (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporate review feedback and tweaks for win_aura Created 9 years 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/layer_unittest.cc ('k') | ui/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/test/compositor_test_support.h" 8 #include "ui/gfx/compositor/test/compositor_test_support.h"
9 #include "ui/views/view.h"
10
11 #if defined(USE_WEBKIT_COMPOSITOR)
12 #include "ui/gfx/compositor/compositor_setup.h"
13 #else
9 #include "ui/gfx/test/gfx_test_utils.h" 14 #include "ui/gfx/test/gfx_test_utils.h"
10 #include "ui/views/view.h" 15 #endif
11 16
12 class ViewTestSuite : public base::TestSuite { 17 class ViewTestSuite : public base::TestSuite {
13 public: 18 public:
14 ViewTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} 19 ViewTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
15 20
16 protected: 21 protected:
17 virtual void Initialize() { 22 virtual void Initialize() {
18 base::TestSuite::Initialize(); 23 base::TestSuite::Initialize();
19 24
20 ui::RegisterPathProvider(); 25 ui::RegisterPathProvider();
21 ui::ResourceBundle::InitSharedInstance("en-US"); 26 ui::ResourceBundle::InitSharedInstance("en-US");
22 27
23 ui::CompositorTestSupport::Initialize(); 28 ui::CompositorTestSupport::Initialize();
29 #if defined(USE_WEBKIT_COMPOSITOR)
30 ui::SetupTestCompositor();
31 #else
24 ui::gfx_test_utils::SetupTestCompositor(); 32 ui::gfx_test_utils::SetupTestCompositor();
33 #endif
25 } 34 }
26 35
27 virtual void Shutdown() { 36 virtual void Shutdown() {
28 ui::CompositorTestSupport::Terminate(); 37 ui::CompositorTestSupport::Terminate();
29 } 38 }
30 }; 39 };
31 40
32 int main(int argc, char** argv) { 41 int main(int argc, char** argv) {
33 return ViewTestSuite(argc, argv).Run(); 42 return ViewTestSuite(argc, argv).Run();
34 } 43 }
OLDNEW
« no previous file with comments | « ui/gfx/compositor/layer_unittest.cc ('k') | ui/views/view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698