6 files changed, 63 insertions, 34 deletions
diff --git a/ui/aura/test/run_all_unittests.cc b/ui/aura/test/run_all_unittests.cc
index 9932c03..5f184b0 100644
--- a/ui/aura/test/run_all_unittests.cc
+++ b/ui/aura/test/run_all_unittests.cc
@@ -2,8 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/bind.h"
+#include "base/test/unit_test_launcher.h"
 #include "ui/aura/test/test_suite.h"
 
 int main(int argc, char** argv) {
-  return aura::test::AuraTestSuite(argc, argv).Run();
+  aura::test::AuraTestSuite test_suite(argc, argv);
+
+  return base::LaunchUnitTests(
+      argc, argv, base::Bind(&aura::test::AuraTestSuite::Run,
+                             base::Unretained(&test_suite)));
 }
diff --git a/ui/compositor/run_all_unittests.cc b/ui/compositor/run_all_unittests.cc
index 52bb2fa..f2f7251 100644
--- a/ui/compositor/run_all_unittests.cc
+++ b/ui/compositor/run_all_unittests.cc
@@ -2,8 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/bind.h"
+#include "base/test/unit_test_launcher.h"
 #include "ui/compositor/test/test_suite.h"
 
 int main(int argc, char** argv) {
-  return ui::test::CompositorTestSuite(argc, argv).Run();
+  ui::test::CompositorTestSuite test_suite(argc, argv);
+
+  return base::LaunchUnitTests(
+      argc, argv, base::Bind(&ui::test::CompositorTestSuite::Run,
+                             base::Unretained(&test_suite)));
 }
diff --git a/ui/message_center/test/run_all_unittests.cc b/ui/message_center/test/run_all_unittests.cc
index ff863b6..a4bfa26 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)));
 }
diff --git a/ui/snapshot/test/run_all_unittests.cc b/ui/snapshot/test/run_all_unittests.cc
index 5bf3d5f..395f0f6 100644
--- a/ui/snapshot/test/run_all_unittests.cc
+++ b/ui/snapshot/test/run_all_unittests.cc
@@ -2,13 +2,39 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/bind.h"
 #include "base/test/test_suite.h"
+#include "base/test/unit_test_launcher.h"
 #include "ui/compositor/test/test_suite.h"
 
+namespace {
+
+class NoAtExitBaseTestSuite : public base::TestSuite {
+ public:
+  NoAtExitBaseTestSuite(int argc, char** argv)
+      : base::TestSuite(argc, argv, false) {
+  }
+};
+
+int RunTestSuite(int argc, char** argv) {
+  return NoAtExitBaseTestSuite(argc, argv).Run();
+}
+
+}  // namespace
+
 int main(int argc, char** argv) {
 #if defined(USE_AURA)
-  return ui::test::CompositorTestSuite(argc, argv).Run();
+  ui::test::CompositorTestSuite test_suite(argc, argv);
+
+  return base::LaunchUnitTests(
+      argc, argv, base::Bind(&ui::test::CompositorTestSuite::Run,
+                             base::Unretained(&test_suite)));
 #else
-  return base::TestSuite(argc, argv).Run();
+#if !defined(OS_ANDROID)
+  base::AtExitManager at_exit;
+#endif
+  return base::LaunchUnitTests(argc,
+                               argv,
+                               base::Bind(&RunTestSuite, argc, argv));
 #endif
 }
diff --git a/ui/test/run_all_unittests.cc b/ui/test/run_all_unittests.cc
index 13ed8d6..6c45f66 100644
--- a/ui/test/run_all_unittests.cc
+++ b/ui/test/run_all_unittests.cc
@@ -2,8 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/bind.h"
+#include "base/test/unit_test_launcher.h"
 #include "ui/test/test_suite.h"
 
 int main(int argc, char** argv) {
-  return ui::test::UITestSuite(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)));
 }
diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc
index 6c425d7..fb99c44 100644
--- a/ui/views/run_all_unittests.cc
+++ b/ui/views/run_all_unittests.cc
@@ -3,8 +3,10 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
+#include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/test/test_suite.h"
+#include "base/test/unit_test_launcher.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/views/view.h"
@@ -25,5 +27,9 @@ class ViewTestSuite : public base::TestSuite {
 };
 
 int main(int argc, char** argv) {
-  return ViewTestSuite(argc, argv).Run();
+  ViewTestSuite test_suite(argc, argv);
+
+  return base::LaunchUnitTests(
+      argc, argv, base::Bind(&ViewTestSuite::Run,
+                             base::Unretained(&test_suite)));
 }