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

Side by Side Diff: ui/keyboard/keyboard_test_suite.cc

Issue 21052007: aura: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: UseRealGLBindings for CompositingRWHVBrowserTests on win_rel 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
« no previous file with comments | « ui/compositor/test/test_suite.cc ('k') | ui/message_center/test/run_all_unittests.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/compiler_specific.h" 6 #include "base/compiler_specific.h"
7 #include "ui/compositor/compositor_setup.h"
8 #include "ui/test/test_suite.h" 7 #include "ui/test/test_suite.h"
9 8
10 class KeyboardTestSuite : public ui::test::UITestSuite { 9 class KeyboardTestSuite : public ui::test::UITestSuite {
11 public: 10 public:
12 KeyboardTestSuite(int argc, char** argv) 11 KeyboardTestSuite(int argc, char** argv)
13 : ui::test::UITestSuite(argc, argv) { 12 : ui::test::UITestSuite(argc, argv) {
14 } 13 }
15 14
16 protected: 15 protected:
17 virtual void Initialize() OVERRIDE; 16 virtual void Initialize() OVERRIDE;
18 virtual void Shutdown() OVERRIDE; 17 virtual void Shutdown() OVERRIDE;
19 18
20 private: 19 private:
21 DISALLOW_COPY_AND_ASSIGN(KeyboardTestSuite); 20 DISALLOW_COPY_AND_ASSIGN(KeyboardTestSuite);
22 }; 21 };
23 22
24 void KeyboardTestSuite::Initialize() { 23 void KeyboardTestSuite::Initialize() {
25 ui::test::UITestSuite::Initialize(); 24 ui::test::UITestSuite::Initialize();
26
27 ui::SetupTestCompositor();
28 } 25 }
29 26
30 void KeyboardTestSuite::Shutdown() { 27 void KeyboardTestSuite::Shutdown() {
31 ui::test::UITestSuite::Shutdown(); 28 ui::test::UITestSuite::Shutdown();
32 } 29 }
33 30
34 int main(int argc, char** argv) { 31 int main(int argc, char** argv) {
35 return KeyboardTestSuite(argc, argv).Run(); 32 return KeyboardTestSuite(argc, argv).Run();
36 } 33 }
OLDNEW
« no previous file with comments | « ui/compositor/test/test_suite.cc ('k') | ui/message_center/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698