Move layout-test-specific switches from shell_switches to layout_test_switches.h

content/shell/common/shell_switches.cc

Index: content/shell/common/shell_switches.cc
diff --git a/content/shell/common/shell_switches.cc b/content/shell/common/shell_switches.cc
index a1252440a0aac8481bcd86c4e5cfc6686f103b4e..09a38175c1a96cf8660161451f009d46811ef0ca 100644
--- a/content/shell/common/shell_switches.cc
+++ b/content/shell/common/shell_switches.cc
@@ -6,15 +6,10 @@
 
 #include "base/command_line.h"
 #include "base/strings/string_split.h"
+#include "content/shell/common/layout_test/layout_test_switches.h"
 
 namespace switches {
 
-// Allow access to external pages during layout tests.
-const char kAllowExternalPages[] = "allow-external-pages";
-
-// Check whether all system dependencies for running layout tests are met.
-const char kCheckLayoutTestSysDeps[] = "check-layout-test-sys-deps";
-
 // Tells Content Shell that it's running as a content_browsertest.
 const char kContentBrowserTest[] = "browser-test";
 
@@ -24,30 +19,6 @@ const char kContentShellDataPath[] = "data-path";
 // The directory breakpad should store minidumps in.
 const char kCrashDumpsDir[] = "crash-dumps-dir";
 
-// When specified to "enable-leak-detection" command-line option,
-// causes the leak detector to cause immediate crash when found leak.
-const char kCrashOnFailure[] = "crash-on-failure";
-
-// Enable accelerated 2D canvas.
-const char kEnableAccelerated2DCanvas[] = "enable-accelerated-2d-canvas";
-
-// Enable font antialiasing for pixel tests.
-const char kEnableFontAntialiasing[] = "enable-font-antialiasing";
-
-// Always use the complex text path for layout tests.
-const char kAlwaysUseComplexText[] = "always-use-complex-text";
-
-// Enables the leak detection of loading webpages. This allows us to check
-// whether or not reloading a webpage releases web-related objects correctly.
-const char kEnableLeakDetection[] = "enable-leak-detection";
-
-// Encode binary layout test results (images, audio) using base64.
-const char kEncodeBinary[] = "encode-binary";
-
-// Exposes the window.internals object to JavaScript for interactive development
-// and debugging of layout tests that rely on it.
-const char kExposeInternalsForTesting[] = "expose-internals-for-testing";
-
 // Enable site isolation (--site-per-process style isolation) for a subset of
 // sites. The argument is a wildcard pattern which will be matched against the
 // site URL to determine which sites to isolate. This can be used to isolate
@@ -61,16 +32,6 @@ const char kIsolateSitesForTesting[] = "isolate-sites-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
-// kRunLayoutTest is set. For the features' level, see
-// http://dev.chromium.org/blink/runtime-enabled-features.
-const char kStableReleaseMode[] = "stable-release-mode";
-
 // Size for the content_shell's host window (i.e. "800x600").
 const char kContentShellHostWindowSize[] = "content-shell-host-window-size";
 
@@ -86,4 +47,9 @@ std::vector<std::string> GetSideloadFontFiles() {
   return files;
 }
 
+bool IsRunLayoutTestSwitchPresent() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kRunLayoutTest);
+}
+
 }  // namespace switches