| commit | 9127e72a5de0bb23da9217653306ec94951118c1 | [log] [tgz] |
|---|---|---|
| author | James Robinson <jamesr@chromium.org> | Mon Dec 29 14:41:55 2014 -0800 |
| committer | James Robinson <jamesr@chromium.org> | Mon Dec 29 14:41:55 2014 -0800 |
| tree | 4a12b5b87d7ccd2340338e81b005e94102d589be | |
| parent | 6016ca0b9361880b8b28abc67a068f4b00ec6101 [diff] [blame] |
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
diff --git a/tools/android/forwarder2/host_forwarder_main.cc b/tools/android/forwarder2/host_forwarder_main.cc index 56ce4f2..47f2252 100644 --- a/tools/android/forwarder2/host_forwarder_main.cc +++ b/tools/android/forwarder2/host_forwarder_main.cc
@@ -406,8 +406,8 @@ } int RunHostForwarder(int argc, char** argv) { - CommandLine::Init(argc, argv); - const CommandLine& cmd_line = *CommandLine::ForCurrentProcess(); + base::CommandLine::Init(argc, argv); + const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess(); bool kill_server = false; Pickle pickle;