Revert 204014 "Don't track whether a resize ack is pending durin..."

trunk/src/content/test/layouttest_support.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/public/test/layouttest_support.h"
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
-#include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/gpu/image_transport_surface.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "third_party/WebKit/public/platform/WebGamepads.h"
 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "content/browser/web_contents/web_contents_drag_win.h"
 #endif
@@ skipping 43 matching lines @@
   RenderThreadImpl::current()->set_layout_test_mode(true);
 }
 
 void EnableBrowserLayoutTestMode() {
 #if defined(OS_MACOSX)
   ImageTransportSurface::SetAllowOSMesaForTesting(true);
   PopupMenuHelper::DontShowPopupMenuForTesting();
 #elif defined(OS_WIN) && !defined(USE_AURA)
   WebContentsDragWin::DisableDragDropForTesting();
 #endif
-  RenderWidgetHostImpl::DisableResizeAckCheckForTesting();
 }
 
 int GetLocalSessionHistoryLength(RenderView* render_view) {
   return static_cast<RenderViewImpl*>(render_view)
       ->GetLocalSessionHistoryLengthForTesting();
 }
 
 void SyncNavigationState(RenderView* render_view) {
   static_cast<RenderViewImpl*>(render_view)->SyncNavigationState();
 }
@@ skipping 23 matching lines @@
   static_cast<RenderViewImpl*>(render_view)
       ->EnableAutoResizeForTesting(min_size, max_size);
 }
 
 void DisableAutoResizeMode(RenderView* render_view, const WebSize& new_size) {
   static_cast<RenderViewImpl*>(render_view)
       ->DisableAutoResizeForTesting(new_size);
 }
 
 }  // namespace content