Update from https://crrev.com/309717

tools/android/common/daemon.cc

Index: tools/android/common/daemon.cc
diff --git a/tools/android/common/daemon.cc b/tools/android/common/daemon.cc
index 699c615676fd37336e92976e0082b940ed65a10b..943457610955a3b850d504a4b4ba237df2e50392 100644
--- a/tools/android/common/daemon.cc
+++ b/tools/android/common/daemon.cc
@@ -33,11 +33,11 @@ void CloseFileDescriptor(int fd) {
 
 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);
 }