diff options
| author | avi <avi@chromium.org> | 2014-12-22 21:51:23 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-23 05:52:27 +0000 |
| commit | 6b10fd03dd0b8ddb91235c49d3f498fb2002c20d (patch) | |
| tree | d7aab532283c818d2103fc9b5ca8bcf29d50b2c8 /tools/imagediff | |
| parent | b126eb8f934f25877b0e6d992902e88eac3fec7f (diff) | |
| download | chromium_src-6b10fd03dd0b8ddb91235c49d3f498fb2002c20d.zip chromium_src-6b10fd03dd0b8ddb91235c49d3f498fb2002c20d.tar.gz chromium_src-6b10fd03dd0b8ddb91235c49d3f498fb2002c20d.tar.bz2 | |
Make callers of CommandLine use it via the base:: namespace.
Covers testing/, tools/, ui/, and win8/.
BUG=422426
TEST=none
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/819223002
Cr-Commit-Position: refs/heads/master@{#309538}
Diffstat (limited to 'tools/imagediff')
| -rw-r--r-- | tools/imagediff/image_diff.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc index 6a9ebb9..608b7c9 100644 --- a/tools/imagediff/image_diff.cc +++ b/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]), |