CommandLine API rework

webkit/tools/test_shell/test_shell_main.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.
 
 // Creates an instance of the test_shell.
 #include "build/build_config.h"
 
 #include <stdlib.h>  // required by _set_abort_behavior
 
 #if defined(OS_WIN)
@@ skipping 116 matching lines @@
 #ifdef _CRTDBG_MAP_ALLOC
   _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
   _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
 #endif
   // Some tests may use base::Singleton<>, thus we need to instanciate
   // the AtExitManager or else we will leak objects.
   base::AtExitManager at_exit_manager;  
 
 #if defined(OS_LINUX)
   gtk_init(&argc, &argv);
-  // Only parse the command line after GTK's had a crack at it.
-  CommandLine::SetArgcArgv(argc, argv);
 #endif
 
-  CommandLine parsed_command_line;
+  // Only parse the command line after GTK's had a crack at it.
+  CommandLine::Init(argc, argv);
+
+  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   if (parsed_command_line.HasSwitch(test_shell::kStartupDialog))
     TestShell::ShowStartupDebuggingDialog();
 
   if (parsed_command_line.HasSwitch(test_shell::kCheckLayoutTestSystemDeps)) {
     exit(CheckLayoutTestSystemDependencies() ? 0 : 1);
   }
 
   // Allocate a message loop for this thread.  Although it is not used
   // directly, its constructor sets up some necessary state.
   MessageLoopForUI main_message_loop;
@@ skipping 106 matching lines @@
 
   // Default to a homepage if we're interactive.
   if (!layout_test_mode) {
     PathService::Get(base::DIR_SOURCE_ROOT, &uri);
     file_util::AppendToPath(&uri, L"webkit");
     file_util::AppendToPath(&uri, L"data");
     file_util::AppendToPath(&uri, L"test_shell");
     file_util::AppendToPath(&uri, L"index.html");
   }
 
-  if (parsed_command_line.GetLooseValueCount() > 0) {
-    CommandLine::LooseValueIterator iter(
-        parsed_command_line.GetLooseValuesBegin());
-    uri = *iter;
-  }
+  std::vector<std::wstring> loose_values = parsed_command_line.GetLooseValues();
+  if (loose_values.size() > 0)
+    uri = loose_values[0];
 
-  std::wstring js_flags = 
+  std::wstring js_flags =
     parsed_command_line.GetSwitchValue(test_shell::kJavaScriptFlags);
   // Test shell always exposes the GC.
-  CommandLine::AppendSwitch(&js_flags, L"expose-gc");
+  js_flags += L" --expose-gc";
   webkit_glue::SetJavaScriptFlags(js_flags);
   // Also expose GCController to JavaScript.
   webkit_glue::SetShouldExposeGCController(true);
 
   // Load and initialize the stats table.  Attempt to construct a somewhat
   // unique name to isolate separate instances from each other.
   StatsTable *table = new StatsTable(
       kStatsFilePrefix + Uint64ToString(base::RandUint64()),
       kStatsFileThreads,
       kStatsFileCounters);
@@ skipping 107 matching lines @@
 
   // Tear down shared StatsTable; prevents unit_tests from leaking it.
   StatsTable::set_current(NULL);
   delete table;
 
 #ifdef _CRTDBG_MAP_ALLOC
   _CrtDumpMemoryLeaks();
 #endif
   return 0;
 }