Update from https://crrev.com/309717

testing/android/native_test_launcher.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.
 
 // This class sets up the environment for running the native tests inside an
 // android application. It outputs (to a fifo) markers identifying the
 // START/PASSED/CRASH of the test suite, FAILURE/SUCCESS of individual tests,
 // etc.
 // These markers are read by the test runner script to generate test results.
 // It installs signal handlers to detect crashes.
@@ skipping 108 matching lines @@
 static void RunTests(JNIEnv* env,
                      jobject obj,
                      jstring jcommand_line_flags,
                      jstring jcommand_line_file_path,
                      jstring jfiles_dir,
                      jobject app_context) {
   base::AtExitManager exit_manager;
 
   // Command line initialized basically, will be fully initialized later.
   static const char* const kInitialArgv[] = { "ChromeTestActivity" };
-  CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);
+  base::CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);
 
   // Set the application context in base.
   base::android::ScopedJavaLocalRef<jobject> scoped_context(
       env, env->NewLocalRef(app_context));
   base::android::InitApplicationContext(env, scoped_context);
   base::android::RegisterJni(env);
 
   std::vector<std::string> args;
 
   const std::string command_line_file_path(
       base::android::ConvertJavaStringToUTF8(env, jcommand_line_file_path));
   if (command_line_file_path.empty())
     ParseArgsFromCommandLineFile(kCommandLineFilePath, &args);
   else
     ParseArgsFromCommandLineFile(command_line_file_path.c_str(), &args);
 
   const std::string command_line_flags(
       base::android::ConvertJavaStringToUTF8(env, jcommand_line_flags));
   ParseArgsFromString(command_line_flags, &args);
 
   std::vector<char*> argv;
   int argc = ArgsToArgv(args, &argv);
 
   // Fully initialize command line with arguments.
-  CommandLine::ForCurrentProcess()->AppendArguments(
-      CommandLine(argc, &argv[0]), false);
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  base::CommandLine::ForCurrentProcess()->AppendArguments(
+      base::CommandLine(argc, &argv[0]), false);
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
 
   base::FilePath files_dir(
       base::android::ConvertJavaStringToUTF8(env, jfiles_dir));
 
   // A few options, such "--gtest_list_tests", will just use printf directly
   // Always redirect stdout to a known file.
   base::FilePath fifo_path(files_dir.Append(base::FilePath("test.fifo")));
   EnsureCreateFIFO(fifo_path);
 
   base::FilePath stderr_fifo_path, stdin_fifo_path;
@@ skipping 37 matching lines @@
   InstallHandlers();
 
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();
   if (!RegisterNativesImpl(env)) {
     return -1;
   }
 
   return JNI_VERSION_1_4;
 }