Revert of Revert of Convert installer_util_unittests, sbox_integration_tests, sbox_validation_tests, sbox_unittests to …

base/test/test_suite.h

Index: base/test/test_suite.h
diff --git a/base/test/test_suite.h b/base/test/test_suite.h
index 8794803cb4e12d6f3dbb2bdb9c2bf251b3f27bad..37cad03f992f2e9db95b520c7bf1b32af702141d 100644
--- a/base/test/test_suite.h
+++ b/base/test/test_suite.h
@@ -29,6 +29,9 @@
   typedef bool (*TestMatch)(const testing::TestInfo&);
 
   TestSuite(int argc, char** argv);
+#if defined(OS_WIN)
+  TestSuite(int argc, wchar_t** argv);
+#endif  // defined(OS_WIN)
   virtual ~TestSuite();
 
   // Returns true if the test is marked as "MAYBE_".
@@ -69,8 +72,13 @@
   scoped_ptr<base::AtExitManager> at_exit_manager_;
 
  private:
+  void InitializeFromCommandLine(int argc, char** argv);
+#if defined(OS_WIN)
+  void InitializeFromCommandLine(int argc, wchar_t** argv);
+#endif  // defined(OS_WIN)
+
   // Basic initialization for the test suite happens here.
-  void PreInitialize(int argc, char** argv, bool create_at_exit_manager);
+  void PreInitialize(bool create_at_exit_manager);
 
   bool initialized_command_line_;