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

content/public/test/content_browser_test.cc

Index: content/public/test/content_browser_test.cc
diff --git a/content/public/test/content_browser_test.cc b/content/public/test/content_browser_test.cc
index 64208f776ac12d90a5ec0050bb3106136e0555a1..ad300e299eddcb7d9c06152d81e11ede46290e61 100644
--- a/content/public/test/content_browser_test.cc
+++ b/content/public/test/content_browser_test.cc
@@ -66,7 +66,7 @@ void ContentBrowserTest::SetUp() {
     // setting a global that may be used after ContentBrowserTest is
     // destroyed.
     ContentRendererClient* old_client =
-        command_line->HasSwitch(switches::kRunLayoutTest)
+        switches::IsRunLayoutTestSwitchPresent()
             ? SetRendererClientForTesting(new LayoutTestContentRendererClient)
             : SetRendererClientForTesting(new ShellContentRendererClient);
     // No-one should have set this value before we did.
@@ -106,8 +106,7 @@ void ContentBrowserTest::TearDown() {
 }
 
 void ContentBrowserTest::RunTestOnMainThreadLoop() {
-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kRunLayoutTest)) {
+  if (!switches::IsRunLayoutTestSwitchPresent()) {
     CHECK_EQ(Shell::windows().size(), 1u);
     shell_ = Shell::windows()[0];
   }