Update from https://crrev.com/309717

gpu/gles2_conform_support/native/main.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 "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 #if defined(OS_WIN)
 #include "base/strings/utf_string_conversions.h"
 #endif
 #include "ui/gl/gl_surface.h"
 
 extern "C" {
 #if defined(GLES2_CONFORM_SUPPORT_ONLY)
 #include "gpu/gles2_conform_support/gtf/gtf_stubs.h"
 #else
 #include "third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFMain.h"
 #endif
 }
 
 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;
 #endif
 
   scoped_ptr<const char*[]> argsArray(new const char*[args.size()+1]);
   argsArray[0] = argv[0];
 
 #if defined(OS_WIN)
   std::vector<std::string> argsNonWide(args.size());
   for (size_t index = 0; index < args.size(); ++index) {
     argsNonWide[index] = base::UTF16ToASCII(args[index]);
     argsArray[index+1] = argsNonWide[index].c_str();
   }
 #else
   for (size_t index = 0; index < args.size(); ++index) {
     argsArray[index+1] = args[index].c_str();
   }
 #endif
 
   GTFMain(static_cast<int>(args.size()+1),
     const_cast<char**>(argsArray.get()));
 
   return 0;
 }