Relanding this as the previous attempt failed due to build errors.

content/plugin/plugin_thread.cc

Index: content/plugin/plugin_thread.cc
===================================================================
--- content/plugin/plugin_thread.cc	(revision 200310)
+++ content/plugin/plugin_thread.cc	(working copy)
@@ -29,6 +29,7 @@
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
 #include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_utils.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #if defined(TOOLKIT_GTK)
@@ -147,7 +148,7 @@
   NPChannelBase::CleanupChannels();
   webkit::npapi::PluginLib::UnloadAllPlugins();
 
-  if (webkit_glue::ShouldForcefullyTerminatePluginProcess())
+  if (webkit::npapi::ShouldForcefullyTerminatePluginProcess())
     base::KillProcess(base::GetCurrentProcessHandle(), 0, /* wait= */ false);
 
   lazy_tls.Pointer()->Set(NULL);