Includes changes for CommandLine moving into the base:: namespace, some
PickleIterator updates, and some animation API changes.

Review URL: https://codereview.chromium.org/817653003
This commit is contained in:
James Robinson 2014-12-29 14:41:55 -08:00
parent ac55b1ae9c
commit dfb7b5f42e

View File

@ -405,8 +405,9 @@ base::FilePath FilePathFromASCII(const std::string& str) {
int main(int argc, const char* argv[]) { int main(int argc, const char* argv[]) {
base::EnableTerminationOnHeapCorruption(); base::EnableTerminationOnHeapCorruption();
CommandLine::Init(argc, argv); base::CommandLine::Init(argc, argv);
const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); const base::CommandLine& parsed_command_line =
*base::CommandLine::ForCurrentProcess();
bool histograms = parsed_command_line.HasSwitch(kOptionCompareHistograms); bool histograms = parsed_command_line.HasSwitch(kOptionCompareHistograms);
if (parsed_command_line.HasSwitch(kOptionPollStdin)) { if (parsed_command_line.HasSwitch(kOptionPollStdin)) {
// Watch stdin for filenames. // Watch stdin for filenames.
@ -432,7 +433,7 @@ int main(int argc, const char* argv[]) {
return 0; 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 (parsed_command_line.HasSwitch(kOptionGenerateDiff)) {
if (args.size() == 3) { if (args.size() == 3) {
return DiffImages(base::FilePath(args[0]), return DiffImages(base::FilePath(args[0]),