Revert "gtk: refactor copy-pasted code"

Build break.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65247 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 32 insertions, 4 deletions

diff --git a/chrome/gpu/gpu_thread.cc b/chrome/gpu/gpu_thread.cc
index 85aea62..8c1059f 100644
--- a/chrome/gpu/gpu_thread.cc
+++ b/chrome/gpu/gpu_thread.cc
@@ -15,7 +15,6 @@
 #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)
@@ -44,7 +43,22 @@ GpuThread::GpuThread() {
     // rethink whether initializing Gtk is really necessary or whether we
     // should just send the display connection down to the GPUProcessor.
     g_thread_init(NULL);
-    gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
+    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]);
+    }
     x11_util::SetDefaultX11ErrorHandlers();
   }
 #endif
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
index 588c532..0e169e4 100644
--- a/chrome/plugin/plugin_thread.cc
+++ b/chrome/plugin/plugin_thread.cc
@@ -27,7 +27,6 @@
 #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"
@@ -59,18 +58,33 @@ PluginThread::PluginThread()
     // 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);
 
-    gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
+    gtk_init(&argc, &argv_pointer);
 
     // 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();