Introduce the notion of a "layout test mode" instead of turning individual flags on and off

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 39b7b3f98a9e60d56e5cebd3b12c99c6d5287d27..6de9edc184c9ec9068ec5bb31de7179ab50c126d 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1414,7 +1414,7 @@ void RenderWidget::didAutoResize(const WebSize& new_size) {
     // with invalid damage rects.
     paint_aggregator_.ClearPendingUpdate();
 
-    if (RenderThreadImpl::current()->short_circuit_size_updates()) {
+    if (RenderThreadImpl::current()->layout_test_mode()) {
       WebRect new_pos(rootWindowRect().x,
                       rootWindowRect().y,
                       new_size.width,
@@ -1425,7 +1425,7 @@ void RenderWidget::didAutoResize(const WebSize& new_size) {
 
     AutoResizeCompositor();
 
-    if (!RenderThreadImpl::current()->short_circuit_size_updates())
+    if (!RenderThreadImpl::current()->layout_test_mode())
       need_update_rect_for_auto_resize_ = true;
   }
 }
@@ -1682,7 +1682,7 @@ void RenderWidget::setToolTipText(const WebKit::WebString& text,
 
 void RenderWidget::setWindowRect(const WebRect& pos) {
   if (did_show_) {
-    if (!RenderThreadImpl::current()->short_circuit_size_updates()) {
+    if (!RenderThreadImpl::current()->layout_test_mode()) {
       Send(new ViewHostMsg_RequestMove(routing_id_, pos));
       SetPendingWindowRect(pos);
     } else {