Move strings for Safety information into OS_CHROMEOS block

Bug: 894790
Change-Id: I67d67ee8849e97195fe8e5bf82f83b8f809145a6
Reviewed-on: https://chromium-review.googlesource.com/c/1281236Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Zachary Kuznia <zork@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600041}

chrome/app/chromium_strings.grd

@@ -222,10 +222,10 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
         <message name="IDS_ABOUT_CROS_WITH_LINUX_VERSION_LICENSE" desc="Additional text displayed beneath the Chromium open source URLs for Chrome OS when Crostini is installed.">
           Chrome OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">&lt;a target="_blank" href="$1"&gt;</ph>open source software<ph name="END_LINK_CROS_OSS">&lt;/a&gt;</ph>, as is <ph name="BEGIN_LINK_LINUX_OSS">&lt;a target="_blank" href="$2"&gt;</ph>Linux (Beta)<ph name="END_LINK_LINUX_OSS">&lt;/a&gt;</ph>.
         </message>
+        <message name="IDS_ABOUT_SAFETY_INFORMATION" desc="The safety label in the About box." translateable="false">
+          Not used in Chromium. Placeholder to keep resource maps in sync.
+        </message>
       </if>
-      <message name="IDS_ABOUT_SAFETY_INFORMATION" desc="The safety label in the About box." translateable="false">
-        Not used in Chromium. Placeholder to keep resource maps in sync.
-      </message>
       <message name="IDS_ABOUT_TERMS_OF_SERVICE" desc="The terms of service label in the About box." translateable="false">
         Not used in Chromium. Placeholder to keep resource maps in sync. It expects one argument: <ph name="ARGUMENT">$1</ph>.
       </message>

chrome/browser/ui/webui/settings/about_handler.cc

@@ -320,6 +320,11 @@ AboutHandler* AboutHandler::Create(content::WebUIDataSource* html_source,
   base::string16 tos = l10n_util::GetStringFUTF16(
       IDS_ABOUT_TERMS_OF_SERVICE, base::UTF8ToUTF16(chrome::kChromeUITermsURL));
   html_source->AddString("aboutProductTos", tos);
+#endif
+
+#if defined(OS_CHROMEOS)
+  html_source->AddBoolean("shouldShowSafetyInfo", ShouldShowSafetyInfo());
+#if defined(GOOGLE_CHROME_BUILD)
   html_source->AddString(
       "aboutProductSafety",
       l10n_util::GetStringUTF16(IDS_ABOUT_SAFETY_INFORMATION));
@@ -327,8 +332,6 @@ AboutHandler* AboutHandler::Create(content::WebUIDataSource* html_source,
                          base::UTF8ToUTF16(chrome::kChromeUISafetyURL));
 #endif
 
-#if defined(OS_CHROMEOS)
-  html_source->AddBoolean("shouldShowSafetyInfo", ShouldShowSafetyInfo());
   base::string16 os_license = l10n_util::GetStringFUTF16(
       IDS_ABOUT_CROS_VERSION_LICENSE,
       base::ASCIIToUTF16(chrome::kChromeUIOSCreditsURL));