CommandLine API rework

base/test_suite.h

 // Copyright (c) 2006-2008 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_SUITE_H_
 #define BASE_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 13 matching lines @@
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
 class TestSuite {
  public:
   TestSuite(int argc, char** argv) {
     base::EnableTerminationOnHeapCorruption();
-    CommandLine::SetArgcArgv(argc, argv);
+    CommandLine::Init(argc, argv);
     testing::InitGoogleTest(&argc, argv);
 #if defined(OS_LINUX)
     gtk_init_check(&argc, &argv);
 #endif
     // Don't add additional code to this constructor.  Instead add it to
     // Initialize().  See bug 6436.
   }
 
   virtual ~TestSuite() {}
 
   // Don't add additional code to this method.  Instead add it to
   // Initialize().  See bug 6436.
   int Run() {
     base::ScopedNSAutoreleasePool scoped_pool;
 
     Initialize();
-    std::wstring client_func = CommandLine().GetSwitchValue(kRunClientProcess);
+    std::wstring client_func =
+        CommandLine::ForCurrentProcess()->GetSwitchValue(kRunClientProcess);
     // Check to see if we are being run as a client process.
     if (!client_func.empty()) {
       // Convert our function name to a usable string for GetProcAddress.
       std::string func_name(client_func.begin(), client_func.end());
 
       return multi_process_function_list::InvokeChildProcessTest(func_name);
     }
     int result = RUN_ALL_TESTS();
 
     Shutdown();
@@ skipping 32 matching lines @@
                          logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
                          logging::LOCK_LOG_FILE,
                          logging::DELETE_OLD_LOG_FILE);
     // We want process and thread IDs because we may have multiple processes.
     // Note: temporarily enabled timestamps in an effort to catch bug 6361.
     logging::SetLogItems(true, true, true, true);
 
 #if defined(OS_WIN)
     // In some cases, we do not want to see standard error dialogs.
     if (!IsDebuggerPresent() &&
-        !CommandLine().HasSwitch(L"show-error-dialogs")) {
+        !CommandLine::ForCurrentProcess()->HasSwitch(L"show-error-dialogs")) {
       SuppressErrorDialogs();
       logging::SetLogAssertHandler(UnitTestAssertHandler);
     }
 #endif
 
     icu_util::Initialize();
   }
 
   virtual void Shutdown() {
   }
 
   // Make sure that we setup an AtExitManager so Singleton objects will be
   // destroyed.
   base::AtExitManager at_exit_manager_;
 };
 
 #endif  // BASE_TEST_SUITE_H_