Replace OS_LINUX ifdefs with OS_POSIX & !OS_MACOSX, TOOLKIT_USES_GTK, or

content/plugin/plugin_thread.cc

 // Copyright (c) 2011 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 "content/plugin/plugin_thread.h"
 
 #include "build/build_config.h"
 
-#if defined(USE_X11)
+#if defined(TOOLKIT_USES_GTK)
 #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"
@@ skipping 22 matching lines @@
 static base::LazyInstance<base::ThreadLocalPointer<PluginThread> > lazy_tls(
     base::LINKER_INITIALIZED);
 
 PluginThread::PluginThread()
     : preloaded_plugin_module_(NULL) {
   plugin_path_ =
       CommandLine::ForCurrentProcess()->GetSwitchValuePath(
           switches::kPluginPath);
 
   lazy_tls.Pointer()->Set(this);
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
   {
     // XEmbed plugins assume they are hosted in a Gtk application, so we need
     // to initialize Gtk in the plugin process.
     g_thread_init(NULL);
 
     // 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);
 
@@ skipping 88 matching lines @@
   bool result = ChildThread::current()->Send(
       new ChildProcessHostMsg_ResolveProxy(url, &net_error, &proxy_result));
   if (!result || net_error != net::OK)
     return false;
 
   *proxy_list = proxy_result;
   return true;
 }
 
 }  // namespace webkit_glue