Revert of Chromium-side patch to rename "--dump-render-tree" to "--run-layout-test".

content/shell/browser/shell_content_browser_client.cc

 // Copyright 2013 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/shell/browser/shell_content_browser_client.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/files/file_util.h"
@@ skipping 120 matching lines @@
   g_browser_client = this;
 }
 
 ShellContentBrowserClient::~ShellContentBrowserClient() {
   g_browser_client = NULL;
 }
 
 BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
   shell_browser_main_parts_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
-                                  switches::kRunLayoutTest)
+                                  switches::kDumpRenderTree)
                                   ? new LayoutTestBrowserMainParts(parameters)
                                   : new ShellBrowserMainParts(parameters);
   return shell_browser_main_parts_;
 }
 
 void ShellContentBrowserClient::RenderProcessWillLaunch(
     RenderProcessHost* host) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kExposeIpcEcho))
     host->AddFilter(new IPCEchoMessageFilter());
@@ skipping 43 matching lines @@
     if (url.scheme() == kProtocolList[i])
       return true;
   }
   return false;
 }
 
 void ShellContentBrowserClient::AppendExtraCommandLineSwitches(
     base::CommandLine* command_line,
     int child_process_id) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kRunLayoutTest))
-    command_line->AppendSwitch(switches::kRunLayoutTest);
+          switches::kDumpRenderTree))
+    command_line->AppendSwitch(switches::kDumpRenderTree);
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableFontAntialiasing))
     command_line->AppendSwitch(switches::kEnableFontAntialiasing);
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kExposeInternalsForTesting))
     command_line->AppendSwitch(switches::kExposeInternalsForTesting);
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kExposeIpcEcho))
     command_line->AppendSwitch(switches::kExposeIpcEcho);
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 24 matching lines @@
         base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
             switches::kRegisterFontFiles));
   }
 }
 
 void ShellContentBrowserClient::OverrideWebkitPrefs(
     RenderViewHost* render_view_host,
     const GURL& url,
     WebPreferences* prefs) {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kRunLayoutTest))
+          switches::kDumpRenderTree))
     return;
   WebKitTestController::Get()->OverrideWebkitPrefs(prefs);
 }
 
 void ShellContentBrowserClient::ResourceDispatcherHostCreated() {
   resource_dispatcher_host_delegate_.reset(
       base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kRunLayoutTest)
+          switches::kDumpRenderTree)
           ? new LayoutTestResourceDispatcherHostDelegate
           : new ShellResourceDispatcherHostDelegate);
   ResourceDispatcherHost::Get()->SetDelegate(
       resource_dispatcher_host_delegate_.get());
 }
 
 std::string ShellContentBrowserClient::GetDefaultDownloadName() {
   return "download";
 }
 
@@ skipping 105 matching lines @@
 ShellBrowserContext*
 ShellContentBrowserClient::ShellBrowserContextForBrowserContext(
     BrowserContext* content_browser_context) {
   if (content_browser_context == browser_context())
     return browser_context();
   DCHECK_EQ(content_browser_context, off_the_record_browser_context());
   return off_the_record_browser_context();
 }
 
 }  // namespace content