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

base/test/test_suite.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_TEST_TEST_SUITE_H_
 #define BASE_TEST_TEST_SUITE_H_
 
 // Defines a basic test suite framework for running gtest based tests.  You can
 // instantiate this class in your main function and call its Run method to run
 // any gtest based tests that are linked into your executable.
@@ skipping 11 matching lines @@
 
 // Instantiates TestSuite, runs it and returns exit code.
 int RunUnitTestsUsingBaseTestSuite(int argc, char **argv);
 
 class TestSuite {
  public:
   // Match function used by the GetTestCount method.
   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_".
   // When using different prefixes depending on platform, we use MAYBE_ and
   // preprocessor directives to replace MAYBE_ with the target prefix.
   static bool IsMarkedMaybe(const testing::TestInfo& test);
 
   void CatchMaybeTests();
 
   void ResetCommandLine();
@@ skipping 20 matching lines @@
   // instead of putting complex code in your constructor/destructor.
 
   virtual void Initialize();
   virtual void Shutdown();
 
   // Make sure that we setup an AtExitManager so Singleton objects will be
   // destroyed.
   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(bool create_at_exit_manager);
+  void PreInitialize(int argc, char** argv, bool create_at_exit_manager);
 
   bool initialized_command_line_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSuite);
 };
 
 }  // namespace base
 
 // TODO(brettw) remove this. This is a temporary hack to allow WebKit to compile
 // until we can update it to use "base::" (preventing a two-sided patch).
 using base::TestSuite;
 
 #endif  // BASE_TEST_TEST_SUITE_H_