Revert of Revert of Convert installer_util_unittests, sbox_integration_tests, sbox_validation_tests, sbox_unittests to … (https://codereview.chromium.org/314173005/)

Reason for revert:
Looks like it was a flake.

Original issue's description:
> 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
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275805

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/327543002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275806 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 30 insertions, 6 deletions

diff --git a/sandbox/win/sandbox_win.gypi b/sandbox/win/sandbox_win.gypi
index 42644bc..01d3f12 100644
--- a/sandbox/win/sandbox_win.gypi
+++ b/sandbox/win/sandbox_win.gypi
@@ -208,6 +208,7 @@
       'type': 'executable',
       'dependencies': [
         'sandbox',
+        '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
@@ -239,6 +240,7 @@
       'type': 'executable',
       'dependencies': [
         'sandbox',
+        '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
@@ -255,6 +257,7 @@
       'type': 'executable',
       'dependencies': [
         'sandbox',
+        '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
diff --git a/sandbox/win/tests/integration_tests/integration_tests.cc b/sandbox/win/tests/integration_tests/integration_tests.cc
index 1996430..bb80931 100644
--- a/sandbox/win/tests/integration_tests/integration_tests.cc
+++ b/sandbox/win/tests/integration_tests/integration_tests.cc
@@ -2,6 +2,9 @@
 // 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"
 
@@ -13,6 +16,10 @@ int wmain(int argc, wchar_t **argv) {
       return sandbox::DispatchCall(argc, argv);
   }
 
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
+  TestSuite test_suite(argc, argv);
+  return base::LaunchUnitTests(
+      argc,
+      argv,
+      false,
+      base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
 }
diff --git a/sandbox/win/tests/unit_tests/unit_tests.cc b/sandbox/win/tests/unit_tests/unit_tests.cc
index a9623db..df98ba2 100644
--- a/sandbox/win/tests/unit_tests/unit_tests.cc
+++ b/sandbox/win/tests/unit_tests/unit_tests.cc
@@ -2,6 +2,9 @@
 // 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"
 
 int wmain(int argc, wchar_t **argv) {
@@ -11,6 +14,10 @@ int wmain(int argc, wchar_t **argv) {
       return 0;
   }
 
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
+  TestSuite test_suite(argc, argv);
+  return base::LaunchUnitTests(
+      argc,
+      argv,
+      false,
+      base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
 }
diff --git a/sandbox/win/tests/validation_tests/unit_tests.cc b/sandbox/win/tests/validation_tests/unit_tests.cc
index 56be2ce..d3fd913 100644
--- a/sandbox/win/tests/validation_tests/unit_tests.cc
+++ b/sandbox/win/tests/validation_tests/unit_tests.cc
@@ -2,6 +2,9 @@
 // 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"
 
@@ -11,6 +14,10 @@ int wmain(int argc, wchar_t **argv) {
       return sandbox::DispatchCall(argc, argv);
   }
 
-  testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
+  TestSuite test_suite(argc, argv);
+  return base::LaunchUnitTests(
+      argc,
+      argv,
+      false,
+      base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
 }