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

Side by Side Diff: trunk/src/ui/message_center/test/run_all_unittests.cc

Issue 22648006: Revert 216780 "Clean up compositor initialization/destruction." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
Property Changes:
Deleted: svn:mergeinfo
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/base/resource/resource_bundle.h" 7 #include "ui/base/resource/resource_bundle.h"
8 #include "ui/base/ui_base_paths.h" 8 #include "ui/base/ui_base_paths.h"
9 #include "ui/test/test_suite.h" 9 #include "ui/test/test_suite.h"
10 #include "ui/views/view.h" 10 #include "ui/views/view.h"
11 11
12 #if defined(TOOLKIT_VIEWS)
13 #include "ui/compositor/compositor_setup.h"
14 #endif
15
12 class MessageCenterTestSuite : public ui::test::UITestSuite { 16 class MessageCenterTestSuite : public ui::test::UITestSuite {
13 public: 17 public:
14 MessageCenterTestSuite(int argc, char** argv) 18 MessageCenterTestSuite(int argc, char** argv)
15 : ui::test::UITestSuite(argc, argv) { 19 : ui::test::UITestSuite(argc, argv) {
16 } 20 }
17 21
18 protected: 22 protected:
19 virtual void Initialize() OVERRIDE; 23 virtual void Initialize() OVERRIDE;
20 virtual void Shutdown() OVERRIDE; 24 virtual void Shutdown() OVERRIDE;
21 25
22 private: 26 private:
23 DISALLOW_COPY_AND_ASSIGN(MessageCenterTestSuite); 27 DISALLOW_COPY_AND_ASSIGN(MessageCenterTestSuite);
24 }; 28 };
25 29
26 void MessageCenterTestSuite::Initialize() { 30 void MessageCenterTestSuite::Initialize() {
27 ui::test::UITestSuite::Initialize(); 31 ui::test::UITestSuite::Initialize();
32
33 #if defined(TOOLKIT_VIEWS)
34 ui::SetupTestCompositor();
35 #endif
28 } 36 }
29 37
30 void MessageCenterTestSuite::Shutdown() { 38 void MessageCenterTestSuite::Shutdown() {
31 ui::test::UITestSuite::Shutdown(); 39 ui::test::UITestSuite::Shutdown();
32 } 40 }
33 41
34 int main(int argc, char** argv) { 42 int main(int argc, char** argv) {
35 return MessageCenterTestSuite(argc, argv).Run(); 43 return MessageCenterTestSuite(argc, argv).Run();
36 } 44 }
OLDNEW
« no previous file with comments | « trunk/src/ui/keyboard/keyboard_test_suite.cc ('k') | trunk/src/ui/snapshot/snapshot_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698