3 files changed, 11 insertions, 4 deletions
diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc
index db521d4..f9d4591 100644
--- a/content/shell/common/shell_content_client.cc
+++ b/content/shell/common/shell_content_client.cc
@@ -35,7 +35,7 @@ std::string ShellContentClient::GetUserAgent() const {
 
 base::string16 ShellContentClient::GetLocalizedString(int message_id) const {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDumpRenderTree)) {
+          switches::kRunLayoutTest)) {
     switch (message_id) {
       case IDS_FORM_OTHER_DATE_LABEL:
         return base::ASCIIToUTF16("<<OtherDateLabel>>");
@@ -62,7 +62,7 @@ base::StringPiece ShellContentClient::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) const {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDumpRenderTree)) {
+          switches::kRunLayoutTest)) {
     switch (resource_id) {
       case IDR_BROKENIMAGE:
 #if defined(OS_MACOSX)
diff --git a/content/shell/common/shell_switches.cc b/content/shell/common/shell_switches.cc
index 6a7a48b..d2f0a29 100644
--- a/content/shell/common/shell_switches.cc
+++ b/content/shell/common/shell_switches.cc
@@ -25,7 +25,9 @@ const char kCrashDumpsDir[] = "crash-dumps-dir";
 // causes the leak detector to cause immediate crash when found leak.
 const char kCrashOnFailure[] = "crash-on-failure";
 
-// Request pages to be dumped as text once they finished loading.
+// Request the render trees of pages to be dumped as text once they have
+// finished loading. Note that this switch has been deprecated, and the
+// identically functioning |kRunLayoutTest| switch should be used instead.
 const char kDumpRenderTree[] = "dump-render-tree";
 
 // Expose window.ipcTester object for testing
@@ -53,9 +55,13 @@ const char kExposeInternalsForTesting[] = "expose-internals-for-testing";
 // with a semicolon (;).
 const char kRegisterFontFiles[] = "register-font-files";
 
+// Request the render trees of pages to be dumped as text once they have
+// finished loading.
+const char kRunLayoutTest[] = "run-layout-test";
+
 // This makes us disable some web-platform runtime features so that we test
 // content_shell as if it was a stable release. It is only followed when
-// kDumpRenderTree is set. For the features' level, see
+// kRunLayoutTest is set. For the features' level, see
 // http://dev.chromium.org/blink/runtime-enabled-features.
 const char kStableReleaseMode[] = "stable-release-mode";
 
diff --git a/content/shell/common/shell_switches.h b/content/shell/common/shell_switches.h
index 48dccbb..8ebbc98 100644
--- a/content/shell/common/shell_switches.h
+++ b/content/shell/common/shell_switches.h
@@ -23,6 +23,7 @@ extern const char kEnableLeakDetection[];
 extern const char kEncodeBinary[];
 extern const char kExposeInternalsForTesting[];
 extern const char kRegisterFontFiles[];
+extern const char kRunLayoutTest[];
 extern const char kStableReleaseMode[];
 extern const char kContentShellHostWindowSize[];