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

content/browser/plugin_process_host.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/browser/plugin_process_host.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_POSIX)
 #include <utility>  // for pair<>
@@ skipping 203 matching lines @@
 
   Launch(
 #if defined(OS_WIN)
       FilePath(),
 #elif defined(OS_POSIX)
       false,
       env,
 #endif
       cmd_line);
 
+  // The plugin needs to be shutdown gracefully, i.e. NP_Shutdown needs to be
+  // called on the plugin. The plugin process exits when it receives the
+  // OnChannelError notification indicating that the browser plugin channel has
+  // been destroyed.
+  SetTerminateChildOnShutdown(false);
+
   content::GetContentClient()->browser()->PluginProcessHostCreated(this);
   AddFilter(new ResolveProxyMsgHelper(NULL));
 
   return true;
 }
 
 void PluginProcessHost::ForceShutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   Send(new PluginProcessMsg_NotifyRenderersOfPendingShutdown());
   BrowserChildProcessHost::ForceShutdown();
@@ skipping 87 matching lines @@
   }
 }
 
 void PluginProcessHost::OnChannelCreated(
     const IPC::ChannelHandle& channel_handle) {
   Client* client = sent_requests_.front();
 
   client->OnChannelOpened(channel_handle);
   sent_requests_.pop();
 }