Revert 209821 "Revert 209776 "Revert 209761 "Fix BrowserPluginHo..."

Reverting for resurfaced Mac ASAN Tests(3) interactive_ui_tests WebViewInteractiveTest.PopupPositioning failures.
This test has only failed while this CL was present; please investigate before re-landing.

Here is the latest failure:
http://build.chromium.org/p/chromium.memory/builders/Mac%20ASAN%20Tests%20%283%29/builds/9216

These were the initial ASAN and 10.6 bot failures that triggered the speculative revert:
http://build.chromium.org/p/chromium.memory/builders/Mac%20ASAN%20Tests%20%283%29/builds/9207
http://build.chromium.org/p/chromium.memory/builders/Mac%20ASAN%20Tests%20%283%29/builds/9208
http://build.chromium.org/p/chromium.memory/builders/Mac%20ASAN%20Tests%20%283%29/builds/9209
http://build.chromium.org/p/chromium.mac/builders/Mac10.6%20Tests%20%281%29/builds/42192
http://build.chromium.org/p/chromium.mac/builders/Mac10.6%20Tests%20%281%29/builds/42194

> Revert 209776 "Revert 209761 "Fix BrowserPluginHostTest.PartialA..."
> speculative revert was speculative; test passed once before revert landed, and failed once after revert landed, so these are not the droids we're looking for.
> 
> > Revert 209761 "Fix BrowserPluginHostTest.PartialAutosizeAttribut..."
> > Speculative revert to deal with new WebViewInteractiveTest.PopupPositioning crash (e.g. http://build.chromium.org/p/chromium.memory/buildstatus?builder=Mac%20ASAN%20Tests%20%283%29&number=9207 and http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac10.6%20Tests%20%281%29&number=42192)
> > 
> > > Fix BrowserPluginHostTest.PartialAutosizeAttributes flake
> > > 
> > > The compositing path was exiting BrowserPlugin::OnUpdateRect early
> > > and so updated autosize parameters weren't making it to BrowserPluginGuest.
> > > 
> > > BUG=255591
> > > Test=BrowserPluginHostTest.PartialAutosizeAttributes no longer flakes locally
> > > 
> > > Review URL: https://chromiumcodereview.appspot.com/18223004
> > 
> > TBR=fsamuel@chromium.org
> > 
> > Review URL: https://codereview.chromium.org/18566005
> 
> TBR=fischman@chromium.org
> 
> Review URL: https://codereview.chromium.org/18054026

TBR=fischman@chromium.org,fsamuel@chromium.org

Review URL: https://codereview.chromium.org/18572005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209835 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 5 deletions

diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index e5c52c3..54724b8 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -1426,12 +1426,9 @@ void BrowserPluginGuest::OnUnlockMouseAck(int instance_id) {
 
 void BrowserPluginGuest::OnUpdateRectACK(
     int instance_id,
-    bool needs_ack,
     const BrowserPluginHostMsg_AutoSize_Params& auto_size_params,
     const BrowserPluginHostMsg_ResizeGuest_Params& resize_guest_params) {
-  // Only the software path expects an ACK.
-  if (needs_ack)
-    Send(new ViewMsg_UpdateRect_ACK(routing_id()));
+  Send(new ViewMsg_UpdateRect_ACK(routing_id()));
   OnSetSize(instance_id_, auto_size_params, resize_guest_params);
 }
 
diff --git a/content/browser/browser_plugin/browser_plugin_guest.h b/content/browser/browser_plugin/browser_plugin_guest.h
index 7db7974..a109a7c 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.h
+++ b/content/browser/browser_plugin/browser_plugin_guest.h
@@ -396,7 +396,6 @@ class CONTENT_EXPORT BrowserPluginGuest
   void OnUpdateGeometry(int instance_id, const gfx::Rect& view_rect);
   void OnUpdateRectACK(
       int instance_id,
-      bool needs_ack,
       const BrowserPluginHostMsg_AutoSize_Params& auto_size_params,
       const BrowserPluginHostMsg_ResizeGuest_Params& resize_guest_params);