Switch child threads so that current() only works on the correct thread and t...

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()
     : 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() {
-  DCHECK(IsPluginProcess());
-  return static_cast<PluginThread*>(ChildThread::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);
   ChildThread::Init();
 
   PatchNPNFunctions();
 #if defined(OS_WIN)
   CoInitialize(NULL);
 #endif
 
   notification_service_.reset(new NotificationService);
 
   // Preload the library to avoid loading, unloading then reloading
@@ skipping 25 matching lines @@
   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);
 }
 
 void PluginThread::OnCreateChannel(int process_id, bool off_the_record) {
   std::string channel_name;
   scoped_refptr<PluginChannel> channel =
       PluginChannel::GetPluginChannel(process_id, owner_loop());
   if (channel.get()) {
     channel_name = channel->channel_name();
     channel->set_off_the_record(off_the_record);
   }
@@ skipping 76 matching lines @@
   }
 
   if (!result || net_error != net::OK)
     return false;
 
   *proxy_list = proxy_result;
   return true;
 }
 
 } // namespace webkit_glue