Revert 86532 - Revert 86517 - Don't terminate plugin processes from the browser during browser sh...

content/plugin/plugin_channel.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_channel.h"
 
 #include "base/command_line.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/synchronization/lock.h"
@@ skipping 14 matching lines @@
 
 namespace {
 
 class PluginReleaseTask : public Task {
  public:
   void Run() {
     ChildProcess::current()->ReleaseProcess();
   }
 };
 
+class PluginProcessExitTask : public Task {
+ public:
+  void Run() {
+    base::KillProcess(base::GetCurrentProcessHandle(), 0, false);
+  }
+};
+
 // How long we wait before releasing the plugin process.
 const int kPluginReleaseTimeMs = 5 * 60 * 1000;  // 5 minutes
 
+// How long we wait before forcibly shutting down the process.
+const int kPluginProcessTerminateTimeoutMs = 3000;
+
 }  // namespace
 
 // If a sync call to the renderer results in a modal dialog, we need to have a
 // way to know so that we can run a nested message loop to simulate what would
 // happen in a single process browser and avoid deadlock.
 class PluginChannel::MessageFilter : public IPC::ChannelProxy::MessageFilter {
  public:
   MessageFilter() : channel_(NULL) { }
   ~MessageFilter() {
     // Clean up in case of renderer crash.
@@ skipping 33 matching lines @@
   }
 
   bool Send(IPC::Message* message) {
     // Need this function for the IPC_MESSAGE_HANDLER_DELAY_REPLY macro.
     return channel_->Send(message);
   }
 
  private:
   void OnFilterAdded(IPC::Channel* channel) { channel_ = channel; }
 
+  virtual void OnChannelError() {
+    // Ensure that we don't wait indefinitely for the plugin to shutdown.
+    // as the browser does not terminate plugin processes on shutdown.
+    // We achieve this by posting an exit process task on the IO thread.
+    MessageLoop::current()->PostDelayedTask(FROM_HERE,
+                                            new PluginProcessExitTask(),
+                                            kPluginProcessTerminateTimeoutMs);
+  }
+
   bool OnMessageReceived(const IPC::Message& message) {
     IPC_BEGIN_MESSAGE_MAP(PluginChannel::MessageFilter, message)
       IPC_MESSAGE_HANDLER_DELAY_REPLY(PluginMsg_Init, OnInit)
       IPC_MESSAGE_HANDLER(PluginMsg_SignalModalDialogEvent,
                           OnSignalModalDialogEvent)
       IPC_MESSAGE_HANDLER(PluginMsg_ResetModalDialogEvent,
                           OnResetModalDialogEvent)
     IPC_END_MESSAGE_MAP()
     return message.type() == PluginMsg_SignalModalDialogEvent::ID ||
            message.type() == PluginMsg_ResetModalDialogEvent::ID;
@@ skipping 224 matching lines @@
 
 bool PluginChannel::Init(base::MessageLoopProxy* ipc_message_loop,
                          bool create_pipe_now) {
   if (!PluginChannelBase::Init(ipc_message_loop, create_pipe_now))
     return false;
 
   channel_->AddFilter(filter_.get());
   return true;
 }