Update from https://crrev.com/309717

tools/android/forwarder2/device_forwarder_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <signal.h>
 #include <stdlib.h>
 
 #include <iostream>
 #include <string>
 
@@ skipping 121 matching lines @@
       has_failed_ = true;
       return;
     }
   }
 
  private:
   bool has_failed_;
 };
 
 int RunDeviceForwarder(int argc, char** argv) {
-  CommandLine::Init(argc, argv);  // Needed by logging.
-  const bool kill_server = CommandLine::ForCurrentProcess()->HasSwitch(
-      "kill-server");
+  base::CommandLine::Init(argc, argv);  // Needed by logging.
+  const bool kill_server =
+      base::CommandLine::ForCurrentProcess()->HasSwitch("kill-server");
   if ((kill_server && argc != 2) || (!kill_server && argc != 1)) {
     std::cerr << "Usage: device_forwarder [--kill-server]" << std::endl;
     return 1;
   }
   base::AtExitManager at_exit_manager;  // Used by base::Thread.
   ClientDelegate client_delegate;
   ServerDelegate daemon_delegate;
   const char kLogFilePath[] = "";  // Log to logcat.
   Daemon daemon(kLogFilePath, kDaemonIdentifier, &client_delegate,
                 &daemon_delegate, &GetExitNotifierFD);
 
   if (kill_server)
     return !daemon.Kill();
 
   if (!daemon.SpawnIfNeeded())
     return 1;
   return client_delegate.has_failed();
 }
 
 }  // namespace
 }  // namespace forwarder2
 
 int main(int argc, char** argv) {
   return forwarder2::RunDeviceForwarder(argc, argv);
 }