Chromium Code Reviews| OLD | NEW |
|---|---|
| 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" | 7 #include "base/test/test_suite.h" |
| 8 #include "ui/base/resource/resource_bundle.h" | 8 #include "ui/base/resource/resource_bundle.h" |
|
bryeung
2013/04/16 14:13:35
are all of these includes necessary?
sadrul
2013/04/16 15:24:56
Good catch. Removed the ones one needed.
| |
| 9 #include "ui/base/ui_base_paths.h" | 9 #include "ui/base/ui_base_paths.h" |
| 10 #include "ui/compositor/compositor_setup.h" | 10 #include "ui/compositor/compositor_setup.h" |
| 11 #include "ui/compositor/test/compositor_test_support.h" | 11 #include "ui/compositor/test/compositor_test_support.h" |
| 12 #include "ui/test/test_suite.h" | |
| 12 #include "ui/views/view.h" | 13 #include "ui/views/view.h" |
| 13 | 14 |
| 14 class MessageCenterTestSuite : public base::TestSuite { | 15 class KeyboardTestSuite : public ui::test::UITestSuite { |
| 15 public: | 16 public: |
| 16 MessageCenterTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} | 17 KeyboardTestSuite(int argc, char** argv) |
| 18 : ui::test::UITestSuite(argc, argv) { | |
| 19 } | |
| 17 | 20 |
| 18 protected: | 21 protected: |
| 19 virtual void Initialize() OVERRIDE; | 22 virtual void Initialize() OVERRIDE; |
| 20 virtual void Shutdown() OVERRIDE; | 23 virtual void Shutdown() OVERRIDE; |
| 21 | 24 |
| 22 private: | 25 private: |
| 23 DISALLOW_COPY_AND_ASSIGN(MessageCenterTestSuite); | 26 DISALLOW_COPY_AND_ASSIGN(KeyboardTestSuite); |
| 24 }; | 27 }; |
| 25 | 28 |
| 26 void MessageCenterTestSuite::Initialize() { | 29 void KeyboardTestSuite::Initialize() { |
| 27 base::TestSuite::Initialize(); | 30 ui::test::UITestSuite::Initialize(); |
| 28 | |
| 29 ui::RegisterPathProvider(); | |
| 30 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); | |
| 31 | 31 |
| 32 ui::CompositorTestSupport::Initialize(); | 32 ui::CompositorTestSupport::Initialize(); |
| 33 ui::SetupTestCompositor(); | 33 ui::SetupTestCompositor(); |
| 34 } | 34 } |
| 35 | 35 |
| 36 void MessageCenterTestSuite::Shutdown() { | 36 void KeyboardTestSuite::Shutdown() { |
| 37 ui::CompositorTestSupport::Terminate(); | 37 ui::CompositorTestSupport::Terminate(); |
| 38 ui::test::UITestSuite::Shutdown(); | |
| 38 } | 39 } |
| 39 | 40 |
| 40 int main(int argc, char** argv) { | 41 int main(int argc, char** argv) { |
| 41 return MessageCenterTestSuite(argc, argv).Run(); | 42 return KeyboardTestSuite(argc, argv).Run(); |
| 42 } | 43 } |
| OLD | NEW |