Update from https://crrev.com/309717

gpu/gles2_conform_support/gles2_conform_test.cc

Index: gpu/gles2_conform_support/gles2_conform_test.cc
diff --git a/gpu/gles2_conform_support/gles2_conform_test.cc b/gpu/gles2_conform_support/gles2_conform_test.cc
index 46a511569cb078aa43aaf37496b6db894ad4f5cb..906e1af2754a28efdbd5f642373d1a80209742d1 100644
--- a/gpu/gles2_conform_support/gles2_conform_test.cc
+++ b/gpu/gles2_conform_support/gles2_conform_test.cc
@@ -63,8 +63,8 @@ bool RunGLES2ConformTest(const char* path) {
   base::FilePath program(test_path.Append(FILE_PATH_LITERAL(
       "gles2_conform_test_windowless")));
 
-  CommandLine* currentCmdLine = CommandLine::ForCurrentProcess();
-  CommandLine cmdline(program);
+  base::CommandLine* currentCmdLine = base::CommandLine::ForCurrentProcess();
+  base::CommandLine cmdline(program);
   cmdline.AppendArguments(*currentCmdLine, false);
   cmdline.AppendSwitch(std::string("--"));
   cmdline.AppendArg(std::string("-run=") + path);
@@ -85,7 +85,7 @@ bool RunGLES2ConformTest(const char* path) {
 
 int main(int argc, char** argv) {
   base::AtExitManager exit_manager;
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif