Don't track whether a resize ack is pending during layout tests

content/renderer/render_widget.cc

Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index e2f00e25f58ce24c43c754dffd71ca0b68c10872..56278f299be059cbf3af22a76923f89be12d4d1e 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -371,9 +371,13 @@ void RenderWidget::Resize(const gfx::Size& new_size,
                           const gfx::Rect& resizer_rect,
                           bool is_fullscreen,
                           ResizeAck resize_ack) {
-  // A resize ack shouldn't be requested if we have not ACK'd the previous one.
-  DCHECK(resize_ack != SEND_RESIZE_ACK || !next_paint_is_resize_ack());
-  DCHECK(resize_ack == SEND_RESIZE_ACK || resize_ack == NO_RESIZE_ACK);
+  if (!RenderThreadImpl::current() ||  // Will be NULL during unit tests.
+      !RenderThreadImpl::current()->layout_test_mode()) {
+    // A resize ack shouldn't be requested if we have not ACK'd the previous
+    // one.
+    DCHECK(resize_ack != SEND_RESIZE_ACK || !next_paint_is_resize_ack());
+    DCHECK(resize_ack == SEND_RESIZE_ACK || resize_ack == NO_RESIZE_ACK);
+  }
 
   // Ignore this during shutdown.
   if (!webwidget_)
@@ -410,7 +414,8 @@ void RenderWidget::Resize(const gfx::Size& new_size,
     // Resize should have caused an invalidation of the entire view.
     DCHECK(new_size.IsEmpty() || is_accelerated_compositing_active_ ||
            paint_aggregator_.HasPendingUpdate());
-  } else if (size_browser_expects_ == new_size) {
+  } else if (!RenderThreadImpl::current() ||  // Will be NULL during unit tests.
+             !RenderThreadImpl::current()->layout_test_mode()) {
     resize_ack = NO_RESIZE_ACK;
   }
 
@@ -467,7 +472,6 @@ void RenderWidget::OnResize(const ViewMsg_Resize_Params& params) {
   Resize(params.new_size, params.physical_backing_size,
          params.overdraw_bottom_height, params.resizer_rect,
          params.is_fullscreen, SEND_RESIZE_ACK);
-  size_browser_expects_ = params.new_size;
 }
 
 void RenderWidget::OnChangeResizeRect(const gfx::Rect& resizer_rect) {
@@ -537,7 +541,6 @@ void RenderWidget::OnUpdateRectAck() {
   TRACE_EVENT0("renderer", "RenderWidget::OnUpdateRectAck");
   DCHECK(update_reply_pending_);
   update_reply_pending_ = false;
-  size_browser_expects_ = size_;
 
   // If we sent an UpdateRect message with a zero-sized bitmap, then we should
   // have no current paint buffer.