| Index: ui/keyboard/keyboard_test_suite.cc
|
| diff --git a/ui/message_center/test/run_all_unittests.cc b/ui/keyboard/keyboard_test_suite.cc
|
| similarity index 61%
|
| copy from ui/message_center/test/run_all_unittests.cc
|
| copy to ui/keyboard/keyboard_test_suite.cc
|
| index c69a9015918656f8be5822116ca41d57714349f8..14b62b1e184fc8f0978e0c21eeae7500f82c475c 100644
|
| --- a/ui/message_center/test/run_all_unittests.cc
|
| +++ b/ui/keyboard/keyboard_test_suite.cc
|
| @@ -9,34 +9,35 @@
|
| #include "ui/base/ui_base_paths.h"
|
| #include "ui/compositor/compositor_setup.h"
|
| #include "ui/compositor/test/compositor_test_support.h"
|
| +#include "ui/test/test_suite.h"
|
| #include "ui/views/view.h"
|
|
|
| -class MessageCenterTestSuite : public base::TestSuite {
|
| +class KeyboardTestSuite : public ui::test::UITestSuite {
|
| public:
|
| - MessageCenterTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
|
| + KeyboardTestSuite(int argc, char** argv)
|
| + : ui::test::UITestSuite(argc, argv) {
|
| + }
|
|
|
| protected:
|
| virtual void Initialize() OVERRIDE;
|
| virtual void Shutdown() OVERRIDE;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(MessageCenterTestSuite);
|
| + DISALLOW_COPY_AND_ASSIGN(KeyboardTestSuite);
|
| };
|
|
|
| -void MessageCenterTestSuite::Initialize() {
|
| - base::TestSuite::Initialize();
|
| -
|
| - ui::RegisterPathProvider();
|
| - ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
|
| +void KeyboardTestSuite::Initialize() {
|
| + ui::test::UITestSuite::Initialize();
|
|
|
| ui::CompositorTestSupport::Initialize();
|
| ui::SetupTestCompositor();
|
| }
|
|
|
| -void MessageCenterTestSuite::Shutdown() {
|
| +void KeyboardTestSuite::Shutdown() {
|
| ui::CompositorTestSupport::Terminate();
|
| + ui::test::UITestSuite::Shutdown();
|
| }
|
|
|
| int main(int argc, char** argv) {
|
| - return MessageCenterTestSuite(argc, argv).Run();
|
| + return KeyboardTestSuite(argc, argv).Run();
|
| }
|
|
|