gtk: refactor copy-pasted code

chrome/plugin/plugin_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/plugin/plugin_thread.h"
 
 #include "build/build_config.h"
 
 #if defined(USE_X11)
 #include <gtk/gtk.h>
 #elif defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/process_util.h"
 #include "base/thread_local.h"
 #include "chrome/common/child_process.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/plugin/chrome_plugin_host.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/render_thread.h"
+#include "gfx/gtk_util.h"
 #include "ipc/ipc_channel_handle.h"
 #include "net/base/net_errors.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 #if defined(USE_X11)
 #include "app/x11_util.h"
 #elif defined(OS_MACOSX)
 #include "app/l10n_util.h"
@@ skipping 11 matching lines @@
   plugin_path_ =
       CommandLine::ForCurrentProcess()->GetSwitchValuePath(
           switches::kPluginPath);
 
   lazy_tls.Pointer()->Set(this);
 #if defined(OS_LINUX)
   {
     // XEmbed plugins assume they are hosted in a Gtk application, so we need
     // to initialize Gtk in the plugin process.
     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();
 
     // Flash has problems receiving clicks with newer GTKs due to the
     // client-side windows change.  To be safe, we just always set the
     // backwards-compat environment variable.
     setenv("GDK_NATIVE_WINDOWS", "1", 1);
 
-    gtk_init(&argc, &argv_pointer);
+    gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
 
     // GTK after 2.18 resets the environment variable.  But if we're using
     // nspluginwrapper, that means it'll spawn its subprocess without the
     // environment variable!  So set it again.
     setenv("GDK_NATIVE_WINDOWS", "1", 1);
-
-    for (size_t i = 0; i < args.size(); ++i) {
-      free(argv[i]);
-    }
   }
 
   x11_util::SetDefaultX11ErrorHandlers();
 #endif
 
   PatchNPNFunctions();
 
   // Preload the library to avoid loading, unloading then reloading
   preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_);
 
@@ skipping 138 matching lines @@
   }
 
   if (!result || net_error != net::OK)
     return false;
 
   *proxy_list = proxy_result;
   return true;
 }
 
 }  // namespace webkit_glue