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

1 files changed, 2 insertions, 9 deletions

diff --git a/sandbox/win/tests/integration_tests/integration_tests.cc b/sandbox/win/tests/integration_tests/integration_tests.cc
index bb80931..1996430 100644
--- a/sandbox/win/tests/integration_tests/integration_tests.cc
+++ b/sandbox/win/tests/integration_tests/integration_tests.cc
@@ -2,9 +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 "testing/gtest/include/gtest/gtest.h"
 #include "sandbox/win/tests/common/controller.h"
 
@@ -16,10 +13,6 @@ int wmain(int argc, wchar_t **argv) {
       return sandbox::DispatchCall(argc, argv);
   }
 
-  TestSuite test_suite(argc, argv);
-  return base::LaunchUnitTests(
-      argc,
-      argv,
-      false,
-      base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
+  testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
 }