CommandLine API rework

chrome/tools/test/image_diff/image_diff.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.
 
 // This file input format is based loosely on
 // WebKitTools/DumpRenderTree/ImageDiff.m
 
 // The exact format of this tool's output to stdout is important, to match
 // what the run-webkit-tests script expects.
 
@@ skipping 302 matching lines @@
                      false, &png_encoding);
   if (file_util::WriteFile(UTF8ToWide(out_file),
       reinterpret_cast<char*>(&png_encoding.front()), png_encoding.size()) < 0)
     return kStatusError;
 
   return kStatusDifferent;
 }
 
 int main(int argc, const char* argv[]) {
   base::EnableTerminationOnHeapCorruption();
-  // TODO(estade): why does using the default constructor (command line
-  // singleton) cause an exception when run in debug mode?
-#if defined(OS_WIN)
-  CommandLine parsed_command_line(::GetCommandLine());
-#elif defined(OS_POSIX)
-  CommandLine parsed_command_line(argc, argv);
-#endif
+  CommandLine::Init(argc, argv);
+  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   if (parsed_command_line.HasSwitch(kOptionPollStdin)) {
     // Watch stdin for filenames.
     std::string stdin_buffer;
     std::string filename1_buffer;
     bool have_filename1 = false;
     while (std::getline(std::cin, stdin_buffer)) {
       if (stdin_buffer.empty())
         continue;
 
       if (have_filename1) {
         // CompareImages writes results to stdout unless an error occurred.
         if (CompareImages(filename1_buffer.c_str(), stdin_buffer.c_str()) ==
             kStatusError)
           printf("error\n");
         fflush(stdout);
         have_filename1 = false;
       } else {
         // Save the first filename in another buffer and wait for the second
         // filename to arrive via stdin.
         filename1_buffer = stdin_buffer;
         have_filename1 = true;
       }
     }
     return 0;
   }
 
+  std::vector<std::wstring> values = parsed_command_line.GetLooseValues();
   if (parsed_command_line.HasSwitch(kOptionGenerateDiff)) {
-    if (3 == parsed_command_line.GetLooseValueCount()) {
-      CommandLine::LooseValueIterator iter =
-          parsed_command_line.GetLooseValuesBegin();
-      return DiffImages(WideToUTF8(*iter).c_str(),
-                        WideToUTF8(*(iter + 1)).c_str(),
-                        WideToUTF8(*(iter + 2)).c_str());
+    if (values.size() == 3) {
+      return DiffImages(WideToUTF8(values[0]).c_str(),
+                        WideToUTF8(values[1]).c_str(),
+                        WideToUTF8(values[2]).c_str());
     }
-  } else if (2 == parsed_command_line.GetLooseValueCount()) {
+  } else if (values.size() == 2) {
     return CompareImages(argv[1], argv[2]);
   }
 
   PrintHelp();
   return kStatusError;
 }