Update from https://crrev.com/309717

sky/tools/imagediff/image_diff.cc

Index: sky/tools/imagediff/image_diff.cc
diff --git a/sky/tools/imagediff/image_diff.cc b/sky/tools/imagediff/image_diff.cc
index e562048ce28c9579971e3c3886d4d2b4f848a322..4aed16adc683ed577f7993bc962d441857e1431a 100644
--- a/sky/tools/imagediff/image_diff.cc
+++ b/sky/tools/imagediff/image_diff.cc
@@ -405,8 +405,9 @@ base::FilePath FilePathFromASCII(const std::string& str) {
 
 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.
@@ -432,7 +433,7 @@ int main(int argc, const char* argv[]) {
     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]),