Update from https://crrev.com/309717

sky/tools/imagediff/image_diff.cc

 // Copyright (c) 2011 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
 // Tools/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 387 matching lines @@
 base::FilePath FilePathFromASCII(const std::string& str) {
 #if defined(OS_WIN)
   return base::FilePath(base::ASCIIToUTF16(str));
 #else
   return base::FilePath(str);
 #endif
 }
 
 int main(int argc, const char* argv[]) {
   base::EnableTerminationOnHeapCorruption();
-  CommandLine::Init(argc, argv);
-  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+  base::CommandLine::Init(argc, argv);
+  const base::CommandLine& parsed_command_line =
+      *base::CommandLine::ForCurrentProcess();
   bool histograms = parsed_command_line.HasSwitch(kOptionCompareHistograms);
   if (parsed_command_line.HasSwitch(kOptionPollStdin)) {
     // Watch stdin for filenames.
     std::string stdin_buffer;
     base::FilePath filename1;
     while (std::getline(std::cin, stdin_buffer)) {
       if (stdin_buffer.empty())
         continue;
 
       if (!filename1.empty()) {
         // CompareImages writes results to stdout unless an error occurred.
         base::FilePath filename2 = FilePathFromASCII(stdin_buffer);
         if (CompareImages(filename1, filename2, histograms) == kStatusError)
           printf("error\n");
         fflush(stdout);
         filename1 = base::FilePath();
       } else {
         // Save the first filename in another buffer and wait for the second
         // filename to arrive via stdin.
         filename1 = FilePathFromASCII(stdin_buffer);
       }
     }
     return 0;
   }
 
-  const CommandLine::StringVector& args = parsed_command_line.GetArgs();
+  const base::CommandLine::StringVector& args = parsed_command_line.GetArgs();
   if (parsed_command_line.HasSwitch(kOptionGenerateDiff)) {
     if (args.size() == 3) {
       return DiffImages(base::FilePath(args[0]),
                         base::FilePath(args[1]),
                         base::FilePath(args[2]));
     }
   } else if (args.size() == 2) {
     return CompareImages(
         base::FilePath(args[0]), base::FilePath(args[1]), histograms);
   }
 
   PrintHelp();
   return kStatusError;
 }