Update from https://crrev.com/309717

tools/android/forwarder/forwarder.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 <errno.h>
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <pthread.h>
 #include <signal.h>
@@ skipping 359 matching lines @@
   for (int i = 0; i < g_server_count; i++)
     g_servers[i].DumpInformation();
 }
 
 }  // namespace
 
 int main(int argc, char** argv) {
   printf("Android device to host TCP forwarder\n");
   printf("Like 'adb forward' but in the reverse direction\n");
 
-  CommandLine command_line(argc, argv);
-  CommandLine::StringVector server_args = command_line.GetArgs();
+  base::CommandLine command_line(argc, argv);
+  base::CommandLine::StringVector server_args = command_line.GetArgs();
   if (tools::HasHelpSwitch(command_line) || server_args.empty()) {
     tools::ShowHelp(
         argv[0],
         "<Device port>[:<Forward to port>:<Forward to address>] ...",
         "  <Forward to port> default is <Device port>\n"
         "  <Forward to address> default is 127.0.0.1\n"
         "If <Device port> is 0, a port will by dynamically allocated.\n");
     return 0;
   }
 
@@ skipping 25 matching lines @@
   for (int i = 0; i < g_server_count; i++)
     g_servers[i].StartThread();
   for (int i = 0; i < g_server_count; i++)
     g_servers[i].JoinThread();
   g_server_count = 0;
   delete [] g_servers;
 
   return 0;
 }