CommandLine API rework

webkit/tools/test_shell/mac/main.mm

 // Copyright (c) 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.
 
 #import <Cocoa/Cocoa.h>
 #include <sys/syslimits.h>
 #include <unistd.h>
 #import <mach/task.h>
 
 #include <string>
@@ skipping 97 matching lines @@
   MessageLoop main_message_loop(MessageLoop::TYPE_UI);
 
   // Force AppKit to init itself, but don't start the runloop yet
   [NSApplication sharedApplication];
   [NSBundle loadNibNamed:@"MainMenu" owner:NSApp];
 
   // Interpret the same flags as
   // the windows version, so that we can run the same test scripts. stop
   // if we hit something that's not a switch (like, oh, a URL).
 
-  CommandLine::SetArgcArgv(argc, argv);
-  CommandLine parsed_command_line(argc, argv);
+  CommandLine::Init(argc, argv);
+  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
 
   if (parsed_command_line.HasSwitch(test_shell::kCheckLayoutTestSystemDeps)) {
     // Always succeed the deps check, currently just used by windows port.
     exit(0);
   }
   
   if (parsed_command_line.HasSwitch(test_shell::kStartupDialog)) {
     //TODO: add alert to allow attaching via gdb before things really get going
   }
 
@@ skipping 30 matching lines @@
     const std::wstring timeout_str = parsed_command_line.GetSwitchValue(
         test_shell::kTestShellTimeOut);
     int timeout_ms = static_cast<int>(StringToInt64(timeout_str.c_str()));
     if (timeout_ms > 0)
       TestShell::SetFileTestTimeout(timeout_ms);
   }
 
   std::wstring javascript_flags =
       parsed_command_line.GetSwitchValue(test_shell::kJavaScriptFlags);
   // Test shell always exposes the GC.
-  CommandLine::AppendSwitch(&javascript_flags, L"expose-gc");
+  javascript_flags += L" --expose-gc";
   webkit_glue::SetJavaScriptFlags(javascript_flags);
 
   // Load and initialize the stats table (one per process, so that multiple
   // instances don't interfere with each other)
   char statsfile[64];
   snprintf(statsfile, 64, "%s-%d", kStatsFile, getpid());
   StatsTable *table = 
       new StatsTable(statsfile, kStatsFileThreads, kStatsFileCounters);
   StatsTable::set_current(table);
 
@@ skipping 47 matching lines @@
     NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
     NSString *testShellPath =
         [resourcePath stringByAppendingPathComponent:@"test_shell/index.html"];
     // don't use NSURL; it puts a "localhost" bit in that freaks out our URL
     // handling
     NSString *testShellURL = [NSString stringWithFormat:@"file://%@",
                               testShellPath];
     uri = UTF8ToWide([testShellURL UTF8String]);
   }
 
-  if (parsed_command_line.GetLooseValueCount() > 0) {
-    CommandLine::LooseValueIterator iter =
-        parsed_command_line.GetLooseValuesBegin();
-    uri = *iter;
-  }
-  
+  std::vector<std::wstring> values = parsed_command_line.GetLooseValues();
+  if (values.size() > 0)
+    uri = values[0];
+
   TestShell* shell;
   if (TestShell::CreateNewWindow(uri, &shell)) {
 #ifdef NOTYET
     if (record_mode || playback_mode) {
       // Move the window to the upper left corner for consistent
       // record/playback mode.  For automation, we want this to work
       // on build systems where the script invoking us is a background
       // process.  So for this case, make our window the topmost window
       // as well.
       // ForegroundHelper::SetForeground(shell->mainWnd());
@@ skipping 85 matching lines @@
     if (record_mode)
       base::EventRecorder::current()->StopRecording();
     if (playback_mode)
       base::EventRecorder::current()->StopPlayback();
 #endif
   }
 
   [pool release];
   return 0;
 }