Merge 22369 - Fix plugin IPC issues....

chrome/plugin/webplugin_delegate_stub.cc

Index: chrome/plugin/webplugin_delegate_stub.cc
===================================================================
--- chrome/plugin/webplugin_delegate_stub.cc	(revision 23177)
+++ chrome/plugin/webplugin_delegate_stub.cc	(working copy)
@@ -173,8 +173,7 @@
 }
 
 void WebPluginDelegateStub::OnDidReceiveResponse(
-    const PluginMsg_DidReceiveResponseParams& params, bool* cancel) {
-  *cancel = false;
+    const PluginMsg_DidReceiveResponseParams& params) {
   WebPluginResourceClient* client = webplugin_->GetResourceClient(params.id);
   if (!client)
     return;
@@ -183,8 +182,7 @@
                              params.headers,
                              params.expected_length,
                              params.last_modified,
-                             params.request_is_seekable,
-                             cancel);
+                             params.request_is_seekable);
 }
 
 void WebPluginDelegateStub::OnDidReceiveData(int id,
Property changes on: chrome\plugin\webplugin_delegate_stub.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/plugin/webplugin_delegate_stub.cc:r69-2775
   Merged /trunk/src/chrome/plugin/webplugin_delegate_stub.cc:r22369