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

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

Issue 14141003: [Mac][MC] Fix bustage from various refactorings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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/cocoa/notification_controller_unittest.mm ('k') | no next file » | 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 "base/test/test_suite.h"
8 #include "ui/base/resource/resource_bundle.h" 7 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/base/ui_base_paths.h" 8 #include "ui/base/ui_base_paths.h"
10 #include "ui/compositor/compositor_setup.h" 9 #include "ui/compositor/compositor_setup.h"
11 #include "ui/compositor/test/compositor_test_support.h" 10 #include "ui/compositor/test/compositor_test_support.h"
11 #include "ui/test/test_suite.h"
12 #include "ui/views/view.h" 12 #include "ui/views/view.h"
13 13
14 class MessageCenterTestSuite : public base::TestSuite { 14 class MessageCenterTestSuite : public ui::test::UITestSuite {
15 public: 15 public:
16 MessageCenterTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} 16 MessageCenterTestSuite(int argc, char** argv)
17 : ui::test::UITestSuite(argc, argv) {
18 }
17 19
18 protected: 20 protected:
19 virtual void Initialize() OVERRIDE; 21 virtual void Initialize() OVERRIDE;
20 virtual void Shutdown() OVERRIDE; 22 virtual void Shutdown() OVERRIDE;
21 23
22 private: 24 private:
23 DISALLOW_COPY_AND_ASSIGN(MessageCenterTestSuite); 25 DISALLOW_COPY_AND_ASSIGN(MessageCenterTestSuite);
24 }; 26 };
25 27
26 void MessageCenterTestSuite::Initialize() { 28 void MessageCenterTestSuite::Initialize() {
27 base::TestSuite::Initialize(); 29 ui::test::UITestSuite::Initialize();
28 30
29 ui::RegisterPathProvider(); 31 #if !defined(OS_MACOSX)
30 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
31
32 ui::CompositorTestSupport::Initialize(); 32 ui::CompositorTestSupport::Initialize();
33 ui::SetupTestCompositor(); 33 ui::SetupTestCompositor();
34 #endif
34 } 35 }
35 36
36 void MessageCenterTestSuite::Shutdown() { 37 void MessageCenterTestSuite::Shutdown() {
38 ui::test::UITestSuite::Shutdown();
39
40 #if !defined(OS_MACOSX)
37 ui::CompositorTestSupport::Terminate(); 41 ui::CompositorTestSupport::Terminate();
42 #endif
38 } 43 }
39 44
40 int main(int argc, char** argv) { 45 int main(int argc, char** argv) {
41 return MessageCenterTestSuite(argc, argv).Run(); 46 return MessageCenterTestSuite(argc, argv).Run();
42 } 47 }
OLDNEW
« no previous file with comments | « ui/message_center/cocoa/notification_controller_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698