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

Side by Side Diff: ui/message_center/test/run_all_unittests.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/message_center/message_center.gyp ('k') | ui/views/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/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/compositor/compositor_setup.h" 9 #include "ui/compositor/compositor_setup.h"
10 #include "ui/compositor/test/compositor_test_support.h"
11 #include "ui/test/test_suite.h" 10 #include "ui/test/test_suite.h"
12 #include "ui/views/view.h" 11 #include "ui/views/view.h"
13 12
14 class MessageCenterTestSuite : public ui::test::UITestSuite { 13 class MessageCenterTestSuite : public ui::test::UITestSuite {
15 public: 14 public:
16 MessageCenterTestSuite(int argc, char** argv) 15 MessageCenterTestSuite(int argc, char** argv)
17 : ui::test::UITestSuite(argc, argv) { 16 : ui::test::UITestSuite(argc, argv) {
18 } 17 }
19 18
20 protected: 19 protected:
21 virtual void Initialize() OVERRIDE; 20 virtual void Initialize() OVERRIDE;
22 virtual void Shutdown() OVERRIDE; 21 virtual void Shutdown() OVERRIDE;
23 22
24 private: 23 private:
25 DISALLOW_COPY_AND_ASSIGN(MessageCenterTestSuite); 24 DISALLOW_COPY_AND_ASSIGN(MessageCenterTestSuite);
26 }; 25 };
27 26
28 void MessageCenterTestSuite::Initialize() { 27 void MessageCenterTestSuite::Initialize() {
29 ui::test::UITestSuite::Initialize(); 28 ui::test::UITestSuite::Initialize();
30 29
31 #if !defined(OS_MACOSX) 30 #if !defined(OS_MACOSX)
32 ui::CompositorTestSupport::Initialize();
33 ui::SetupTestCompositor(); 31 ui::SetupTestCompositor();
34 #endif 32 #endif
35 } 33 }
36 34
37 void MessageCenterTestSuite::Shutdown() { 35 void MessageCenterTestSuite::Shutdown() {
38 ui::test::UITestSuite::Shutdown(); 36 ui::test::UITestSuite::Shutdown();
39
40 #if !defined(OS_MACOSX)
41 ui::CompositorTestSupport::Terminate();
42 #endif
43 } 37 }
44 38
45 int main(int argc, char** argv) { 39 int main(int argc, char** argv) {
46 return MessageCenterTestSuite(argc, argv).Run(); 40 return MessageCenterTestSuite(argc, argv).Run();
47 } 41 }
OLDNEW
« no previous file with comments | « ui/message_center/message_center.gyp ('k') | ui/views/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698