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

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

Issue 14744016: Remove unnecessary ui::CompositorTestSupport (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add compositor_test_support dependency to ui/snapshot and ui/views test targets Created 7 years, 6 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/keyboard/keyboard.gyp ('k') | ui/message_center/message_center.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 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" 7 #include "ui/compositor/compositor_setup.h"
8 #include "ui/compositor/test/compositor_test_support.h"
9 #include "ui/test/test_suite.h" 8 #include "ui/test/test_suite.h"
10 9
11 class KeyboardTestSuite : public ui::test::UITestSuite { 10 class KeyboardTestSuite : public ui::test::UITestSuite {
12 public: 11 public:
13 KeyboardTestSuite(int argc, char** argv) 12 KeyboardTestSuite(int argc, char** argv)
14 : ui::test::UITestSuite(argc, argv) { 13 : ui::test::UITestSuite(argc, argv) {
15 } 14 }
16 15
17 protected: 16 protected:
18 virtual void Initialize() OVERRIDE; 17 virtual void Initialize() OVERRIDE;
19 virtual void Shutdown() OVERRIDE; 18 virtual void Shutdown() OVERRIDE;
20 19
21 private: 20 private:
22 DISALLOW_COPY_AND_ASSIGN(KeyboardTestSuite); 21 DISALLOW_COPY_AND_ASSIGN(KeyboardTestSuite);
23 }; 22 };
24 23
25 void KeyboardTestSuite::Initialize() { 24 void KeyboardTestSuite::Initialize() {
26 ui::test::UITestSuite::Initialize(); 25 ui::test::UITestSuite::Initialize();
27 26
28 ui::CompositorTestSupport::Initialize();
29 ui::SetupTestCompositor(); 27 ui::SetupTestCompositor();
30 } 28 }
31 29
32 void KeyboardTestSuite::Shutdown() { 30 void KeyboardTestSuite::Shutdown() {
33 ui::CompositorTestSupport::Terminate();
34 ui::test::UITestSuite::Shutdown(); 31 ui::test::UITestSuite::Shutdown();
35 } 32 }
36 33
37 int main(int argc, char** argv) { 34 int main(int argc, char** argv) {
38 return KeyboardTestSuite(argc, argv).Run(); 35 return KeyboardTestSuite(argc, argv).Run();
39 } 36 }
OLDNEW
« no previous file with comments | « ui/keyboard/keyboard.gyp ('k') | ui/message_center/message_center.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698