CommandLine API rework

chrome/common/ipc_tests.cc

 // 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.
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 #include <stdio.h>
 #include <iostream>
 #include <string>
@@ skipping 34 matching lines @@
   delete message_loop_;
   message_loop_ = NULL;
 
   MultiProcessTest::TearDown();
 }
 
 #if defined(OS_WIN)
 base::ProcessHandle IPCChannelTest::SpawnChild(ChildType child_type,
                                                IPC::Channel *channel) {
   // kDebugChildren support.
-  bool debug_on_start = CommandLine().HasSwitch(switches::kDebugChildren);
+  bool debug_on_start =
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kDebugChildren);
 
   switch (child_type) {
   case TEST_CLIENT:
     return MultiProcessTest::SpawnChild(L"RunTestClient", debug_on_start);
     break;
   case TEST_REFLECTOR:
     return MultiProcessTest::SpawnChild(L"RunReflector", debug_on_start);
     break;
   case FUZZER_SERVER:
     return MultiProcessTest::SpawnChild(L"RunFuzzServer", debug_on_start);
     break;
   default:
     return NULL;
     break;
   }
 }
 #elif defined(OS_POSIX)
 base::ProcessHandle IPCChannelTest::SpawnChild(ChildType child_type,
                                                IPC::Channel *channel) {
   // kDebugChildren support.
-  bool debug_on_start = CommandLine().HasSwitch(switches::kDebugChildren);
+  bool debug_on_start =
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kDebugChildren);
 
   base::file_handle_mapping_vector fds_to_map;
   int src_fd;
   int dest_fd;
   channel->GetClientFileDescriptorMapping(&src_fd, &dest_fd);
   if (src_fd > -1) {
     fds_to_map.push_back(std::pair<int,int>(src_fd, dest_fd));
   }
 
   base::ProcessHandle ret = NULL;
@@ skipping 131 matching lines @@
   options.message_loop_type = MessageLoop::TYPE_IO;
   thread.StartWithOptions(options);
   {
     // setup IPC channel proxy
     IPC::ChannelProxy chan(kTestClientChannel, IPC::Channel::MODE_SERVER,
                            &channel_listener, NULL, thread.message_loop());
 
     channel_listener.Init(&chan);
 
 #if defined(OS_WIN)
-  base::ProcessHandle process_handle = SpawnChild(TEST_CLIENT, NULL);
+    base::ProcessHandle process_handle = SpawnChild(TEST_CLIENT, NULL);
 #elif defined(OS_POSIX)
-    bool debug_on_start = CommandLine().HasSwitch(switches::kDebugChildren);
+    bool debug_on_start = CommandLine::ForCurrentProcess()->HasSwitch(
+                              switches::kDebugChildren);
     base::file_handle_mapping_vector fds_to_map;
     int src_fd;
     int dest_fd;
     chan.GetClientFileDescriptorMapping(&src_fd, &dest_fd);
     if (src_fd > -1) {
       fds_to_map.push_back(std::pair<int,int>(src_fd, dest_fd));
     }
 
     base::ProcessHandle process_handle = MultiProcessTest::SpawnChild(
         L"RunTestClient",
@@ skipping 194 matching lines @@
 #endif  // PERFORMANCE_TEST
 
 int main(int argc, char** argv) {
 #ifdef PERFORMANCE_TEST
   int retval = PerfTestSuite(argc, argv).Run();
 #else
   int retval = TestSuite(argc, argv).Run();
 #endif
   return retval;
 }