diff options
| author | alph@chromium.org <alph@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-09 14:45:31 +0000 |
|---|---|---|
| committer | alph@chromium.org <alph@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-09 14:45:31 +0000 |
| commit | 3e619e55f500e4d400e850bd4daa43a488312e0d (patch) | |
| tree | ae799eba49b49181a4fd6e911504fcac5d17597f /chrome/installer | |
| parent | 5740793cf58a3f9c11cf398ee589c96879440d8b (diff) | |
| download | chromium_src-3e619e55f500e4d400e850bd4daa43a488312e0d.zip chromium_src-3e619e55f500e4d400e850bd4daa43a488312e0d.tar.gz chromium_src-3e619e55f500e4d400e850bd4daa43a488312e0d.tar.bz2 | |
Revert of Convert installer_util_unittests, sbox_integration_tests, sbox_validation_tests, sbox_unittests to … (https://codereview.chromium.org/315403006/)
Reason for revert:
Broke a bunch of unit tests on Win.
http://build.chromium.org/p/chromium.win/builders/Win8%20Aura/builds/19568
Original issue's description:
> 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
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275801
TBR=gab@chromium.org,rvargas@chromium.org,grt@chromium.org,phajdan.jr@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=381071
Review URL: https://codereview.chromium.org/314173005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275805 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/util/run_all_unittests.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/installer/util/run_all_unittests.cc b/chrome/installer/util/run_all_unittests.cc index 3e1f5e4..faa57e62 100644 --- a/chrome/installer/util/run_all_unittests.cc +++ b/chrome/installer/util/run_all_unittests.cc @@ -2,8 +2,6 @@ // 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" @@ -15,10 +13,5 @@ int main(int argc, char** argv) { chrome::RegisterPathProvider(); base::win::ScopedCOMInitializer com_initializer; - if (!com_initializer.succeeded()) - return -1; - return base::LaunchUnitTests( - argc, - argv, - base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); + return com_initializer.succeeded() ? test_suite.Run() : -1; } |