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

content/shell/common/shell_content_client.cc

Index: content/shell/common/shell_content_client.cc
diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc
index d0940b8b92b2fc6836880d883aab8ea97f5ea956..842e0c168502efb12b1ab48c26a1d122bdb0ab81 100644
--- a/content/shell/common/shell_content_client.cc
+++ b/content/shell/common/shell_content_client.cc
@@ -36,8 +36,7 @@ std::string ShellContentClient::GetUserAgent() const {
 }
 
 base::string16 ShellContentClient::GetLocalizedString(int message_id) const {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kRunLayoutTest)) {
+  if (switches::IsRunLayoutTestSwitchPresent()) {
     switch (message_id) {
       case IDS_FORM_OTHER_DATE_LABEL:
         return base::ASCIIToUTF16("<<OtherDateLabel>>");
@@ -63,8 +62,7 @@ base::string16 ShellContentClient::GetLocalizedString(int message_id) const {
 base::StringPiece ShellContentClient::GetDataResource(
     int resource_id,
     ui::ScaleFactor scale_factor) const {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kRunLayoutTest)) {
+  if (switches::IsRunLayoutTestSwitchPresent()) {
     switch (resource_id) {
       case IDR_BROKENIMAGE:
 #if defined(OS_MACOSX)