| Index: ui/message_center/test/run_all_unittests.cc
|
| diff --git a/ui/message_center/test/run_all_unittests.cc b/ui/message_center/test/run_all_unittests.cc
|
| index ff863b6c405f50493ca4df3f4ee01f512f853cbb..a4bfa26d97ceaa8e163d5d7049b45b20bc30385b 100644
|
| --- a/ui/message_center/test/run_all_unittests.cc
|
| +++ b/ui/message_center/test/run_all_unittests.cc
|
| @@ -2,35 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/basictypes.h"
|
| -#include "base/compiler_specific.h"
|
| -#include "ui/base/resource/resource_bundle.h"
|
| -#include "ui/base/ui_base_paths.h"
|
| +#include "base/bind.h"
|
| +#include "base/test/unit_test_launcher.h"
|
| #include "ui/test/test_suite.h"
|
| -#include "ui/views/view.h"
|
| -
|
| -class MessageCenterTestSuite : public ui::test::UITestSuite {
|
| - public:
|
| - MessageCenterTestSuite(int argc, char** argv)
|
| - : ui::test::UITestSuite(argc, argv) {
|
| - }
|
| -
|
| - protected:
|
| - virtual void Initialize() OVERRIDE;
|
| - virtual void Shutdown() OVERRIDE;
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(MessageCenterTestSuite);
|
| -};
|
| -
|
| -void MessageCenterTestSuite::Initialize() {
|
| - ui::test::UITestSuite::Initialize();
|
| -}
|
| -
|
| -void MessageCenterTestSuite::Shutdown() {
|
| - ui::test::UITestSuite::Shutdown();
|
| -}
|
|
|
| int main(int argc, char** argv) {
|
| - return MessageCenterTestSuite(argc, argv).Run();
|
| + ui::test::UITestSuite test_suite(argc, argv);
|
| +
|
| + return base::LaunchUnitTests(
|
| + argc, argv, base::Bind(&ui::test::UITestSuite::Run,
|
| + base::Unretained(&test_suite)));
|
| }
|
|
|