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

content/renderer/render_thread_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 170 matching lines @@
 
 
   // These methods modify how the next message is sent.  Normally, when sending
   // a synchronous message that runs a nested message loop, we need to suspend
   // callbacks into WebKit.  This involves disabling timers and deferring
   // resource loads.  However, there are exceptions when we need to customize
   // the behavior.
   void DoNotSuspendWebKitSharedTimer();
   void DoNotNotifyWebKitOfModalLoop();
 
-  // True if focus changes should be send via IPC to the browser.
-  bool should_send_focus_ipcs() const {
-    return should_send_focus_ipcs_;
+  // True if we are running layout tests. This currently disables forwarding
+  // various status messages to the console, skips network error pages, and
+  // short circuits size update and focus events.
+  bool layout_test_mode() const {
+    return layout_test_mode_;
   }
-  void set_should_send_focus_ipcs(bool send) {
-    should_send_focus_ipcs_ = send;
-  }
-
-  // True if RenderWidgets should report the newly requested size back to
-  // WebKit without waiting for the browser to acknowledge the size.
-  bool short_circuit_size_updates() const {
-    return short_circuit_size_updates_;
-  }
-  void set_short_circuit_size_updates(bool short_circuit) {
-    short_circuit_size_updates_ = short_circuit;
-  }
-
-  // True if we should never display error pages in response to a failed load.
-  bool skip_error_pages() const {
-    return skip_error_pages_;
-  }
-  void set_skip_error_pages(bool skip) {
-    skip_error_pages_ = skip;
+  void set_layout_test_mode(bool layout_test_mode) {
+    layout_test_mode_ = layout_test_mode;
   }
 
   IPC::ForwardingMessageFilter* compositor_output_surface_filter() const {
     return compositor_output_surface_filter_.get();
   }
 
   InputHandlerManager* input_handler_manager() const {
     return input_handler_manager_.get();
   }
 
@@ skipping 202 matching lines @@
 
   // The current value of the idle notification timer delay.
   int64 idle_notification_delay_in_ms_;
 
   // The number of idle handler calls that skip sending idle notifications.
   int idle_notifications_to_skip_;
 
   bool suspend_webkit_shared_timer_;
   bool notify_webkit_of_modal_loop_;
 
-  // The following flags are used to control layout test specific behavior.
-  bool should_send_focus_ipcs_;
-  bool short_circuit_size_updates_;
-  bool skip_error_pages_;
+  // The following flag is used to control layout test specific behavior.
+  bool layout_test_mode_;
 
   // Timer that periodically calls IdleHandler.
   base::RepeatingTimer<RenderThreadImpl> idle_timer_;
 
   // The channel from the renderer process to the GPU process.
   scoped_refptr<GpuChannelHost> gpu_channel_;
 
   // A lazily initiated thread on which file operations are run.
   scoped_ptr<base::Thread> file_thread_;
 
@@ skipping 23 matching lines @@
   scoped_ptr<media::AudioHardwareConfig> audio_hardware_config_;
 
   HistogramCustomizer histogram_customizer_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_