command_buffer_gles2: Fix command-line arguments if they are passed

gpu/gles2_conform_support/egl/egl.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 <EGL/egl.h>
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/config/gpu_util.h"
 #include "gpu/gles2_conform_support/egl/display.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface.h"
 
 #if REGAL_STATIC_EGL
 extern "C" {
 
@@ skipping 84 matching lines @@
   if (dpy == EGL_NO_DISPLAY)
     return EglError(EGL_BAD_DISPLAY, EGL_FALSE);
 
   egl::Display* display = static_cast<egl::Display*>(dpy);
   if (!display->Initialize())
     return EglError(EGL_NOT_INITIALIZED, EGL_FALSE);
 
   // eglInitialize can be called multiple times, prevent InitializeOneOff from
   // being called multiple times.
   if (gfx::GetGLImplementation() == gfx::kGLImplementationNone) {
+    base::CommandLine::StringVector argv;
     scoped_ptr<base::Environment> env(base::Environment::Create());
-    std::vector<std::string> args;
-    std::string env_args;
-    if (env->GetVar("CHROME_COMMAND_BUFFER_GLES2_ARGS", &env_args)) {
-      args = base::SplitString(env_args, " ", base::TRIM_WHITESPACE,
-                               base::SPLIT_WANT_NONEMPTY);
-    }
-    if (args.empty()) {
-      args.push_back("dummy");
-    }
-    scoped_ptr<const char* []> argv(new const char*[args.size()]);
-    for (size_t i = 0; i < args.size(); ++i) {
-      argv[i] = args[i].c_str();
-    }
-    base::CommandLine::Init(static_cast<int>(args.size()), argv.get());
+    std::string env_string;
+    env->GetVar("CHROME_COMMAND_BUFFER_GLES2_ARGS", &env_string);
+#if defined(OS_WIN)
+    argv = base::SplitString(base::UTF8ToUTF16(env_string),
+                             base::kWhitespaceUTF16, base::TRIM_WHITESPACE,
+                             base::SPLIT_WANT_NONEMPTY);
+    argv.insert(argv.begin(), base::UTF8ToUTF16("dummy"));
+#else
+    argv = base::SplitString(env_string,
+                             base::kWhitespaceASCII, base::TRIM_WHITESPACE,
+                             base::SPLIT_WANT_NONEMPTY);
+    argv.insert(argv.begin(), "dummy");
+#endif
+    base::CommandLine::Init(0, nullptr);
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+    // Need to call both Init and InitFromArgv, since Windows does not use
+    // argc, argv in CommandLine::Init(argc, argv).
+    command_line->InitFromArgv(argv);
     if (!command_line->HasSwitch(switches::kDisableGpuDriverBugWorkarounds)) {
       gpu::ApplyGpuDriverBugWorkarounds(command_line);
     }
 
     gfx::GLSurface::InitializeOneOff();
   }
 
   *major = 1;
   *minor = 4;
   return EglSuccess(EGL_TRUE);
@@ skipping 312 matching lines @@
   return EGL_FALSE;
 }
 
 /* Now, define eglGetProcAddress using the generic function ptr. type */
 EGLAPI __eglMustCastToProperFunctionPointerType EGLAPIENTRY
 eglGetProcAddress(const char* procname) {
   return reinterpret_cast<__eglMustCastToProperFunctionPointerType>(
       gles2::GetGLFunctionPointer(procname));
 }
 }  // extern "C"