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

BUG=111316
R=piman@chromium.org

Review URL: https://chromiumcodereview.appspot.com/16026006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202920 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 12 deletions

diff --git a/content/renderer/devtools/devtools_client.cc b/content/renderer/devtools/devtools_client.cc
index 5f760e6..e02c65f 100644
--- a/content/renderer/devtools/devtools_client.cc
+++ b/content/renderer/devtools/devtools_client.cc
@@ -23,12 +23,6 @@ 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();
@@ -116,7 +110,7 @@ void DevToolsClient::removeFileSystem(const WebString& fileSystemPath) {
 }
 
 bool DevToolsClient::isUnderTest() {
-  return g_devtools_frontend_testing_enabled;
+  return RenderThreadImpl::current()->layout_test_mode();
 }
 
 void DevToolsClient::OnDispatchOnInspectorFrontend(const std::string& message) {
@@ -124,9 +118,4 @@ void DevToolsClient::OnDispatchOnInspectorFrontend(const std::string& message) {
       WebString::fromUTF8(message));
 }
 
-// static
-void DevToolsClient::EnableDevToolsFrontendTesting() {
-  g_devtools_frontend_testing_enabled = true;
-}
-
 }  // namespace content