Convert installer_util_unittests, sbox_integration_tests, sbox_validation_tests, sbox_unittests to …

sandbox/win/tests/integration_tests/integration_tests.cc

Index: sandbox/win/tests/integration_tests/integration_tests.cc
diff --git a/sandbox/win/tests/integration_tests/integration_tests.cc b/sandbox/win/tests/integration_tests/integration_tests.cc
index 1996430bb9ea0ae007ee8f579121a9b45727dfb6..2a9cf17ee86fedf0be282492ff139cdf20e1c141 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,8 @@ 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(

[rvargas (doing something else), 2014/06/06 18:55:39]

nit: move bas::Bind to the next line (so the third arg is not broken in two
lines) (and elsewhere).

[Paweł Hajdan Jr., 2014/06/09 09:08:33]

Done.

+          &base::TestSuite::Run, base::Unretained(&test_suite)));
 }