Update from https://crrev.com/309717

tools/android/common/daemon.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 "tools/android/common/daemon.h"
 
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ skipping 15 matching lines @@
 void CloseFileDescriptor(int fd) {
   int old_errno = errno;
   close(fd);
   errno = old_errno;
 }
 
 }  // namespace
 
 namespace tools {
 
-bool HasHelpSwitch(const CommandLine& command_line) {
+bool HasHelpSwitch(const base::CommandLine& command_line) {
   return command_line.HasSwitch("h") || command_line.HasSwitch("help");
 }
 
-bool HasNoSpawnDaemonSwitch(const CommandLine& command_line) {
+bool HasNoSpawnDaemonSwitch(const base::CommandLine& command_line) {
   return command_line.HasSwitch(kNoSpawnDaemon);
 }
 
 void ShowHelp(const char* program,
               const char* extra_title,
               const char* extra_descriptions) {
   printf("Usage: %s [-%s] %s\n"
          " -%s  stops from spawning a daemon process\n%s",
          program, kNoSpawnDaemon, extra_title, kNoSpawnDaemon,
          extra_descriptions);
@@ skipping 15 matching lines @@
 
   // Close the standard input and outputs, otherwise the process may block
   // adbd when the shell exits.
   // Comment out these lines if you want to see outputs for debugging.
   CloseFileDescriptor(0);
   CloseFileDescriptor(1);
   CloseFileDescriptor(2);
 }
 
 }  // namespace tools