Preparing components_perftests

components/test/components_test_suite.cc

Index: components/test/components_test_suite.cc
diff --git a/components/test/run_all_unittests.cc b/components/test/components_test_suite.cc
similarity index 89%
copy from components/test/run_all_unittests.cc
copy to components/test/components_test_suite.cc
index 07d04a10922cfb840dc76bd241f3ee19ef68eb28..ef678a4ccc6c438d8e7e83492197a36254fd0757 100644
--- a/components/test/run_all_unittests.cc
+++ b/components/test/components_test_suite.cc
@@ -1,13 +1,16 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "components/test/components_test_suite.h"
+
 #include <memory>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
@@ -136,11 +139,12 @@ class ComponentsUnitTestEventListener : public testing::EmptyTestEventListener {
 
 }  // namespace
 
-int main(int argc, char** argv) {
+base::RunTestSuiteCallback GetLaunchCallback(int argc, char** argv) {
 #if !defined(OS_IOS)
-  content::UnitTestTestSuite test_suite(new ComponentsTestSuite(argc, argv));
+  auto test_suite = base::MakeUnique<content::UnitTestTestSuite>(
+      new ComponentsTestSuite(argc, argv));
 #else
-  ComponentsTestSuite test_suite(argc, argv);
+  auto test_suite = base::MakeUnique<ComponentsTestSuite>(argc, argv);
 #endif
 
   // The listener will set up common test environment for all components unit
@@ -151,12 +155,8 @@ int main(int argc, char** argv) {
 
 #if !defined(OS_IOS)
   mojo::edk::Init();
-  return base::LaunchUnitTests(argc, argv,
-                               base::Bind(&content::UnitTestTestSuite::Run,
-                                          base::Unretained(&test_suite)));
+  return base::Bind(&content::UnitTestTestSuite::Run, std::move(test_suite));
 #else
-  return base::LaunchUnitTests(
-      argc, argv, base::Bind(&base::TestSuite::Run,
-                             base::Unretained(&test_suite)));
+  return base::Bind(&base::TestSuite::Run, std::move(test_suite));
 #endif
 }