Revert r21117 as it caused reliability failures....

chrome/plugin/plugin_thread.cc

 // Copyright (c) 2006-2008 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(OS_WIN)
+#include <windows.h>
+#include <objbase.h>
+#endif
+
 #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/notification_service.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 "net/base/net_errors.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/webkit_glue.h"
 
 static base::LazyInstance<base::ThreadLocalPointer<PluginThread> > lazy_tls(
     base::LINKER_INITIALIZED);
 
 PluginThread::PluginThread()
-    : preloaded_plugin_module_(NULL) {
+    : ChildThread(base::Thread::Options(MessageLoop::TYPE_UI, 0)),
+      preloaded_plugin_module_(NULL) {
   plugin_path_ = FilePath::FromWStringHack(
       CommandLine::ForCurrentProcess()->GetSwitchValue(switches::kPluginPath));
+}
 
+PluginThread::~PluginThread() {
+}
+
+PluginThread* PluginThread::current() {
+  return lazy_tls.Pointer()->Get();
+}
+
+void PluginThread::OnControlMessageReceived(const IPC::Message& msg) {
+  IPC_BEGIN_MESSAGE_MAP(PluginThread, msg)
+    IPC_MESSAGE_HANDLER(PluginProcessMsg_CreateChannel, OnCreateChannel)
+    IPC_MESSAGE_HANDLER(PluginProcessMsg_PluginMessage, OnPluginMessage)
+  IPC_END_MESSAGE_MAP()
+}
+
+void PluginThread::Init() {
   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.
     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]);
     }
   }
 #endif
+  ChildThread::Init();
 
   PatchNPNFunctions();
+#if defined(OS_WIN)
+  CoInitialize(NULL);
+#endif
+
+  notification_service_.reset(new NotificationService);
 
   // Preload the library to avoid loading, unloading then reloading
   preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_);
 
   ChromePluginLib::Create(plugin_path_, GetCPBrowserFuncsForPlugin());
 
   scoped_refptr<NPAPI::PluginLib> plugin =
       NPAPI::PluginLib::CreatePluginLib(plugin_path_);
   if (plugin.get()) {
     plugin->NP_Initialize();
   }
 
   // Certain plugins, such as flash, steal the unhandled exception filter
   // thus we never get crash reports when they fault. This call fixes it.
   message_loop()->set_exception_restoration(true);
 }
 
-PluginThread::~PluginThread() {
+void PluginThread::CleanUp() {
   if (preloaded_plugin_module_) {
     base::UnloadNativeLibrary(preloaded_plugin_module_);
     preloaded_plugin_module_ = NULL;
   }
   PluginChannelBase::CleanupChannels();
   NPAPI::PluginLib::UnloadAllPlugins();
   ChromePluginLib::UnloadAllPlugins();
+  notification_service_.reset();
+#if defined(OS_WIN)
+  CoUninitialize();
+#endif
 
   if (webkit_glue::ShouldForcefullyTerminatePluginProcess())
     base::KillProcess(base::GetCurrentProcessHandle(), 0, /* wait= */ false);
 
+  // Call this last because it deletes the ResourceDispatcher, which is used
+  // in some of the above cleanup.
+  // See http://code.google.com/p/chromium/issues/detail?id=8980
+  ChildThread::CleanUp();
   lazy_tls.Pointer()->Set(NULL);
 }
 
-PluginThread* PluginThread::current() {
-  return lazy_tls.Pointer()->Get();
-}
-
-void PluginThread::OnControlMessageReceived(const IPC::Message& msg) {
-  IPC_BEGIN_MESSAGE_MAP(PluginThread, msg)
-    IPC_MESSAGE_HANDLER(PluginProcessMsg_CreateChannel, OnCreateChannel)
-    IPC_MESSAGE_HANDLER(PluginProcessMsg_PluginMessage, OnPluginMessage)
-  IPC_END_MESSAGE_MAP()
-}
-
 void PluginThread::OnCreateChannel(
     int process_id,
     bool off_the_record) {
-  scoped_refptr<PluginChannel> channel = PluginChannel::GetPluginChannel(
-      process_id, ChildProcess::current()->io_message_loop());
+  scoped_refptr<PluginChannel> channel =
+      PluginChannel::GetPluginChannel(process_id, owner_loop());
   IPC::ChannelHandle channel_handle;
   if (channel.get()) {
     channel_handle.name = channel->channel_name();
 #if defined(OS_POSIX)
     // On POSIX, pass the renderer-side FD. Also mark it as auto-close so that
     // it gets closed after it has been sent.
     int renderer_fd = channel->DisownRendererFd();
     channel_handle.socket = base::FileDescriptor(renderer_fd, true);
 #endif
     channel->set_off_the_record(off_the_record);
@@ skipping 77 matching lines @@
   }
 
   if (!result || net_error != net::OK)
     return false;
 
   *proxy_list = proxy_result;
   return true;
 }
 
 } // namespace webkit_glue