[CrOS Settings] Update UMA consent strings

UX has requested that we update two strings related to UMA consent.
Additionally, this CL moves two strings which were OS-specific from
settings_strings.grdp to os_settings_strings.grdp.

Fixed: 1043688
Bug: 967883
Change-Id: I906c942ad4b093e95fad6ddc77960d49e879a281
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2146081
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758368}

chrome/app/chromium_strings.grd

@@ -344,7 +344,7 @@ Chromium cannot read and write to its data directory:
       </message>
       <if expr="chromeos">
         <message name="IDS_EULA_CHECKBOX_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging">
-          Optional: Help make Chromium better by automatically sending usage statistics and crash reports to Google.
+          Optional: Help improve Chromium OS features and performance by automatically sending diagnostic and usage data to Google.
         </message>
       </if>
       <message name="IDS_PROFILE_TOO_NEW_ERROR" desc="Error displayed on startup when the profile is from a newer version of the product and can not be read">

chrome/app/google_chrome_strings.grd

@@ -355,7 +355,7 @@ Google Chrome cannot read and write to its data directory:
       </message>
       <if expr="chromeos">
         <message name="IDS_EULA_CHECKBOX_ENABLE_LOGGING" desc="The label of the checkbox to enable/disable crash and user metrics logging on EULA screen.">
-          Optional: Help make Chrome OS better by automatically sending diagnostic and usage data to Google.
+          Optional: Help improve Chrome OS features and performance by automatically sending diagnostic and usage data to Google.
         </message>
       </if>
       <message name="IDS_PROFILE_TOO_NEW_ERROR" desc="Error displayed on startup when the profile is from a newer version of the product and can not be read">

chrome/app/os_settings_strings.grdp

@@ -2659,5 +2659,19 @@
   <message name="IDS_SETTINGS_STORAGE_ITEM_SYSTEM" desc="In Device Settings > Storage, label for the total system size, difference between the size of the filesystem and the size of all items listed on the storage page.">
     System
   </message>
+
+  <!-- Privacy Page -->
+  <message name="IDS_SETTINGS_ENABLE_LOGGING_TOGGLE_TITLE" desc="The label of the checkbox to enable/disable crash and user metrics logging in Chrome OS.">
+    Help improve Chrome OS features and performance
+  </message>
+  <message name="IDS_SETTINGS_ENABLE_LOGGING_TOGGLE_DESC" desc="The description of the checkbox to enable/disable crash and user metrics logging in Chrome OS.">
+    Automatically sends diagnostic and usage data to Google
+  </message>
+  <message name="IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION" desc="description label for verified access about premium contents">
+    Enable Verified Access
+  </message>
+  <message name="IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION" desc="In the settings tab, the text next to the checkbox for enabling quickly reconnecting to known Wi-Fi SSIDs.">
+    Keep Wi-Fi on during sleep
+  </message>
 </if>
 </grit-part>

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION.png.sha1

+67463ff9cd3e69a7b5632059add91ba5b73d29f6
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_ENABLE_LOGGING_TOGGLE_DESC.png.sha1

+67463ff9cd3e69a7b5632059add91ba5b73d29f6
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_ENABLE_LOGGING_TOGGLE_TITLE.png.sha1

+67463ff9cd3e69a7b5632059add91ba5b73d29f6
\ No newline at end of file

chrome/app/os_settings_strings_grdp/IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION.png.sha1

+67463ff9cd3e69a7b5632059add91ba5b73d29f6
\ No newline at end of file

chrome/app/settings_strings.grdp

@@ -1171,12 +1171,6 @@
   <message name="IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TEXT" desc="The text of a confirmation dialog that confirms that the user want to send the 'Do Not Track' header">
     Enabling "Do Not Track" means that a request will be included with your browsing traffic. Any effect depends on whether a website responds to the request, and how the request is interpreted. For example, some websites may respond to this request by showing you ads that aren't based on other websites you've visited. Many websites will still collect and use your browsing data - for example to improve security, to provide content, services, ads and recommendations on their websites, and to generate reporting statistics. <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>
   </message>
-  <message name="IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION" desc="description label for verified access about premium contents">
-    Enable Verified Access
-  </message>
-  <message name="IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION" desc="In the settings tab, the text next to the checkbox for enabling quickly reconnecting to known Wi-Fi SSIDs.">
-    Keep Wi-Fi on during sleep
-  </message>
   <message name="IDS_SETTINGS_PERMISSIONS" desc="Name of the settings page which allows users to manage permissions and site content settings">
     Permissions and content settings
   </message>

chrome/browser/ui/webui/settings/chromeos/os_settings_localized_strings_provider.cc

@@ -1987,8 +1987,8 @@ void AddSearchStrings(content::WebUIDataSource* html_source, Profile* profile) {
 void AddPrivacyStrings(content::WebUIDataSource* html_source) {
   static constexpr webui::LocalizedString kLocalizedStrings[] = {
       {"privacyPageTitle", IDS_SETTINGS_PRIVACY},
-      {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING_PREF},
-      {"enableLoggingDesc", IDS_SETTINGS_ENABLE_LOGGING_PREF_DESC},
+      {"enableLogging", IDS_SETTINGS_ENABLE_LOGGING_TOGGLE_TITLE},
+      {"enableLoggingDesc", IDS_SETTINGS_ENABLE_LOGGING_TOGGLE_DESC},
       {"wakeOnWifi", IDS_SETTINGS_WAKE_ON_WIFI_DESCRIPTION},
       {"enableContentProtectionAttestation",
        IDS_SETTINGS_ENABLE_CONTENT_PROTECTION_ATTESTATION},