Remove webkit/plugins/npapi.

content/plugin/plugin_thread.cc

 // Copyright (c) 2012 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(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #elif defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/process_util.h"
 #include "base/threading/thread_local.h"
 #include "content/child/child_process.h"
 #include "content/child/npapi/npobject_util.h"
 #include "content/child/npapi/plugin_lib.h"
-#include "content/child/npapi/webplugin_delegate_impl.h"
 #include "content/common/plugin_process_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/plugin/content_plugin_client.h"
 #include "ipc/ipc_channel_handle.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/npapi/plugin_utils.h"
 
 #if defined(TOOLKIT_GTK)
 #include "ui/gfx/gtk_util.h"
 #endif
 
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #endif
 
 namespace content {
@@ skipping 26 matching lines @@
     base::KillProcess(base::GetCurrentProcessHandle(), 0, false);
   }
 };
 
 }  // namespace
 
 static base::LazyInstance<base::ThreadLocalPointer<PluginThread> > lazy_tls =
     LAZY_INSTANCE_INITIALIZER;
 
 PluginThread::PluginThread()
-    : preloaded_plugin_module_(NULL) {
+    : preloaded_plugin_module_(NULL),
+      forcefully_terminate_plugin_process_(false) {
   base::FilePath plugin_path =
       CommandLine::ForCurrentProcess()->GetSwitchValuePath(
           switches::kPluginPath);
 
   lazy_tls.Pointer()->Set(this);
 #if defined(USE_AURA)
   // TODO(saintlou):
 #elif defined(TOOLKIT_GTK)
   {
     // XEmbed plugins assume they are hosted in a Gtk application, so we need
@@ skipping 38 matching lines @@
 
   // 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);
   channel()->AddFilter(new EnsureTerminateMessageFilter());
 }
 
 PluginThread::~PluginThread() {
 }
 
+void PluginThread::SetForcefullyTerminatePluginProcess() {
+  forcefully_terminate_plugin_process_ = true;
+}
+
 void PluginThread::Shutdown() {
   if (preloaded_plugin_module_) {
     base::UnloadNativeLibrary(preloaded_plugin_module_);
     preloaded_plugin_module_ = NULL;
   }
   NPChannelBase::CleanupChannels();
   PluginLib::UnloadAllPlugins();
 
-  if (webkit::npapi::ShouldForcefullyTerminatePluginProcess())
+  if (forcefully_terminate_plugin_process_)
     base::KillProcess(base::GetCurrentProcessHandle(), 0, /* wait= */ false);
 
   lazy_tls.Pointer()->Set(NULL);
 }
 
 PluginThread* PluginThread::current() {
   return lazy_tls.Pointer()->Get();
 }
 
 bool PluginThread::OnControlMessageReceived(const IPC::Message& msg) {
@@ skipping 23 matching lines @@
   }
 
   Send(new PluginProcessHostMsg_ChannelCreated(channel_handle));
 }
 
 void PluginThread::OnNotifyRenderersOfPendingShutdown() {
   PluginChannel::NotifyRenderersOfPendingShutdown();
 }
 
 }  // namespace content