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

content/shell/common/shell_content_client.cc

 // Copyright (c) 2012 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/common/shell_content_client.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "blink/public/resources/grit/blink_image_resources.h"
@@ skipping 18 matching lines @@
 }
 
 ShellContentClient::~ShellContentClient() {
 }
 
 std::string ShellContentClient::GetUserAgent() const {
   return GetShellUserAgent();
 }
 
 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>>");
       case IDS_FORM_OTHER_MONTH_LABEL:
         return base::ASCIIToUTF16("<<OtherMonthLabel>>");
       case IDS_FORM_OTHER_TIME_LABEL:
         return base::ASCIIToUTF16("<<OtherTimeLabel>>");
       case IDS_FORM_OTHER_WEEK_LABEL:
         return base::ASCIIToUTF16("<<OtherWeekLabel>>");
       case IDS_FORM_CALENDAR_CLEAR:
         return base::ASCIIToUTF16("<<CalendarClear>>");
       case IDS_FORM_CALENDAR_TODAY:
         return base::ASCIIToUTF16("<<CalendarToday>>");
       case IDS_FORM_THIS_MONTH_LABEL:
         return base::ASCIIToUTF16("<<ThisMonthLabel>>");
       case IDS_FORM_THIS_WEEK_LABEL:
         return base::ASCIIToUTF16("<<ThisWeekLabel>>");
     }
   }
   return l10n_util::GetStringUTF16(message_id);
 }
 
 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)
         resource_id = IDR_CONTENT_SHELL_MISSING_IMAGE_PNG;
 #else
         resource_id = IDR_CONTENT_SHELL_MISSING_IMAGE_GIF;
 #endif
         break;
 
       case IDR_TEXTAREA_RESIZER:
@@ skipping 13 matching lines @@
 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const {
   return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
 }
 
 bool ShellContentClient::IsSupplementarySiteIsolationModeEnabled() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kIsolateSitesForTesting);
 }
 
 }  // namespace content