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" |
|
bryeung
2013/04/16 15:40:50
really? we need this in addition to ui/test/test_
sadrul
2013/04/16 16:02:04
Nope. This isn't necessary either. Removed!
| |
| 8 #include "ui/base/resource/resource_bundle.h" | |
| 9 #include "ui/base/ui_base_paths.h" | |
| 10 #include "ui/compositor/compositor_setup.h" | 8 #include "ui/compositor/compositor_setup.h" |
| 11 #include "ui/compositor/test/compositor_test_support.h" | 9 #include "ui/compositor/test/compositor_test_support.h" |
| 12 #include "ui/views/view.h" | 10 #include "ui/test/test_suite.h" |
| 13 | 11 |
| 14 class MessageCenterTestSuite : public base::TestSuite { | 12 class KeyboardTestSuite : public ui::test::UITestSuite { |
| 15 public: | 13 public: |
| 16 MessageCenterTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} | 14 KeyboardTestSuite(int argc, char** argv) |
| 15 : ui::test::UITestSuite(argc, argv) { | |
| 16 } | |
| 17 | 17 |
| 18 protected: | 18 protected: |
| 19 virtual void Initialize() OVERRIDE; | 19 virtual void Initialize() OVERRIDE; |
| 20 virtual void Shutdown() OVERRIDE; | 20 virtual void Shutdown() OVERRIDE; |
| 21 | 21 |
| 22 private: | 22 private: |
| 23 DISALLOW_COPY_AND_ASSIGN(MessageCenterTestSuite); | 23 DISALLOW_COPY_AND_ASSIGN(KeyboardTestSuite); |
| 24 }; | 24 }; |
| 25 | 25 |
| 26 void MessageCenterTestSuite::Initialize() { | 26 void KeyboardTestSuite::Initialize() { |
| 27 base::TestSuite::Initialize(); | 27 ui::test::UITestSuite::Initialize(); |
| 28 | |
| 29 ui::RegisterPathProvider(); | |
| 30 ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); | |
| 31 | 28 |
| 32 ui::CompositorTestSupport::Initialize(); | 29 ui::CompositorTestSupport::Initialize(); |
| 33 ui::SetupTestCompositor(); | 30 ui::SetupTestCompositor(); |
| 34 } | 31 } |
| 35 | 32 |
| 36 void MessageCenterTestSuite::Shutdown() { | 33 void KeyboardTestSuite::Shutdown() { |
| 37 ui::CompositorTestSupport::Terminate(); | 34 ui::CompositorTestSupport::Terminate(); |
| 35 ui::test::UITestSuite::Shutdown(); | |
| 38 } | 36 } |
| 39 | 37 |
| 40 int main(int argc, char** argv) { | 38 int main(int argc, char** argv) { |
| 41 return MessageCenterTestSuite(argc, argv).Run(); | 39 return KeyboardTestSuite(argc, argv).Run(); |
| 42 } | 40 } |
| OLD | NEW |