Update from https://crrev.com/309717

gpu/gles2_conform_support/native/main.cc

Index: gpu/gles2_conform_support/native/main.cc
diff --git a/gpu/gles2_conform_support/native/main.cc b/gpu/gles2_conform_support/native/main.cc
index d0d05d86455180352a87801278c6eee65a692253..1dc377b099eaaaa500c1cbcebcb6272a8fdbd2af 100644
--- a/gpu/gles2_conform_support/native/main.cc
+++ b/gpu/gles2_conform_support/native/main.cc
@@ -23,11 +23,11 @@ extern "C" {
 
 int main(int argc, char *argv[]) {
   base::AtExitManager at_exit;
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
   base::MessageLoopForUI message_loop;
 
-  CommandLine::StringVector args =
-    CommandLine::ForCurrentProcess()->GetArgs();
+  base::CommandLine::StringVector args =
+      base::CommandLine::ForCurrentProcess()->GetArgs();
 
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;