gtk: refactor copy-pasted code

chrome/gpu/gpu_thread.cc

 // Copyright (c) 2010 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 "chrome/gpu/gpu_thread.h"
 
 #include <string>
 #include <vector>
 
 #include "app/gfx/gl/gl_context.h"
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/common/child_process.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/gpu_info.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/gpu/gpu_info_collector.h"
+#include "gfx/gtk_util.h"
 #include "ipc/ipc_channel_handle.h"
 
 #if defined(OS_WIN)
 #include "chrome/gpu/gpu_view_win.h"
 #elif defined(GPU_USE_GLX)
 #include "chrome/gpu/gpu_backing_store_glx_context.h"
 #include "chrome/gpu/gpu_view_x.h"
 
 #include <X11/Xutil.h>  // Must be last.
 #endif
 
 #if defined(OS_LINUX)
 #include "app/x11_util.h"
 #include <gtk/gtk.h>
 #endif
 
 GpuThread::GpuThread() {
 #if defined(GPU_USE_GLX)
   display_ = ::XOpenDisplay(NULL);
 #endif
 #if defined(OS_LINUX)
   {
     // The X11 port of the command buffer code assumes it can access the X
     // display via the macro GDK_DISPLAY(), which implies that Gtk has been
     // initialized. This code was taken from PluginThread. TODO(kbr):
     // rethink whether initializing Gtk is really necessary or whether we
     // should just send the display connection down to the GPUProcessor.
     g_thread_init(NULL);
-    const std::vector<std::string>& args =
-        CommandLine::ForCurrentProcess()->argv();
-    int argc = args.size();
-    scoped_array<char *> argv(new char *[argc + 1]);
-    for (size_t i = 0; i < args.size(); ++i) {
-      // TODO(piman@google.com): can gtk_init modify argv? Just being safe
-      // here.
-      argv[i] = strdup(args[i].c_str());
-    }
-    argv[argc] = NULL;
-    char **argv_pointer = argv.get();
-
-    gtk_init(&argc, &argv_pointer);
-    for (size_t i = 0; i < args.size(); ++i) {
-      free(argv[i]);
-    }
+    gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
     x11_util::SetDefaultX11ErrorHandlers();
   }
 #endif
 }
 
 GpuThread::~GpuThread() {
 }
 
 #if defined(GPU_USE_GLX)
 GpuBackingStoreGLXContext* GpuThread::GetGLXContext() {
@@ skipping 98 matching lines @@
 void GpuThread::OnCrash() {
   // Good bye, cruel world.
   volatile int* it_s_the_end_of_the_world_as_we_know_it = NULL;
   *it_s_the_end_of_the_world_as_we_know_it = 0xdead;
 }
 
 void GpuThread::OnHang() {
   for (;;)
     PlatformThread::Sleep(1000);
 }