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

content/renderer/devtools/devtools_client.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/renderer/devtools/devtools_client.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsFrontend.h"
 #include "ui/base/ui_base_switches.h"
 #include "webkit/appcache/appcache_interfaces.h"
 
 using WebKit::WebDevToolsFrontend;
 using WebKit::WebString;
 
 namespace content {
 
-namespace {
-
-bool g_devtools_frontend_testing_enabled = false;
-
-}  // namespace
-
 DevToolsClient::DevToolsClient(RenderViewImpl* render_view)
     : RenderViewObserver(render_view) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   web_tools_frontend_.reset(
       WebDevToolsFrontend::create(
           render_view->webview(),
           this,
           ASCIIToUTF16(command_line.GetSwitchValueASCII(switches::kLang))));
   appcache::AddSupportedScheme(chrome::kChromeDevToolsScheme);
 }
@@ skipping 67 matching lines @@
 void DevToolsClient::addFileSystem() {
   Send(new DevToolsHostMsg_AddFileSystem(routing_id()));
 }
 
 void DevToolsClient::removeFileSystem(const WebString& fileSystemPath) {
   Send(new DevToolsHostMsg_RemoveFileSystem(routing_id(),
                                             fileSystemPath.utf8()));
 }
 
 bool DevToolsClient::isUnderTest() {
-  return g_devtools_frontend_testing_enabled;
+  return RenderThreadImpl::current()->layout_test_mode();
 }
 
 void DevToolsClient::OnDispatchOnInspectorFrontend(const std::string& message) {
   web_tools_frontend_->dispatchOnInspectorFrontend(
       WebString::fromUTF8(message));
 }
 
-// static
-void DevToolsClient::EnableDevToolsFrontendTesting() {
-  g_devtools_frontend_testing_enabled = true;
-}
-
 }  // namespace content