From dfb7b5f42e7ca1e385c0c009203046bd91c9a33c Mon Sep 17 00:00:00 2001 From: James Robinson Date: Mon, 29 Dec 2014 14:41:55 -0800 Subject: [PATCH] Update from https://crrev.com/309717 Includes changes for CommandLine moving into the base:: namespace, some PickleIterator updates, and some animation API changes. Review URL: https://codereview.chromium.org/817653003 --- engine/src/flutter/tools/imagediff/image_diff.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/engine/src/flutter/tools/imagediff/image_diff.cc b/engine/src/flutter/tools/imagediff/image_diff.cc index e562048ce2..4aed16adc6 100644 --- a/engine/src/flutter/tools/imagediff/image_diff.cc +++ b/engine/src/flutter/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]),