summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-09 13:33:26 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-09 13:33:26 +0000
commit4797181a495a7c66ff3618cc2002c772205e8b2c (patch)
tree2a3dc67a63ba2e9a81c01eea95e6d9b66a3d22e8 /chrome/installer
parentfe91d5511f4b1c298147a4ff154989238d2cb1d4 (diff)
downloadchromium_src-4797181a495a7c66ff3618cc2002c772205e8b2c.zip
chromium_src-4797181a495a7c66ff3618cc2002c772205e8b2c.tar.gz
chromium_src-4797181a495a7c66ff3618cc2002c772205e8b2c.tar.bz2
Convert installer_util_unittests, sbox_integration_tests, sbox_validation_tests, sbox_unittests to new test launcher
Also add them to the Windows trybots BUG=381071 R=grt@chromium.org, rvargas@chromium.org Review URL: https://codereview.chromium.org/315403006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/util/run_all_unittests.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/installer/util/run_all_unittests.cc b/chrome/installer/util/run_all_unittests.cc
index faa57e62..3e1f5e4 100644
--- a/chrome/installer/util/run_all_unittests.cc
+++ b/chrome/installer/util/run_all_unittests.cc
@@ -2,6 +2,8 @@
// 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/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
#include "base/win/scoped_com_initializer.h"
#include "chrome/common/chrome_paths.h"
@@ -13,5 +15,10 @@ int main(int argc, char** argv) {
chrome::RegisterPathProvider();
base::win::ScopedCOMInitializer com_initializer;
- return com_initializer.succeeded() ? test_suite.Run() : -1;
+ if (!com_initializer.succeeded())
+ return -1;
+ return base::LaunchUnitTests(
+ argc,
+ argv,
+ base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
}