[AF] Unify Autofill settings strings on all platforms (part 1)

Takes Autofill Settings strings related to the new address and credit card
toggles to components/autofill_strings.grpd to share on all platforms.

Bug: 873215
Change-Id: I358455a33734650dceed1196385d5262efa5b90a
Reviewed-on: https://chromium-review.googlesource.com/1171560Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582706}

chrome/app/settings_strings.grdp

@@ -631,15 +631,6 @@
   <message name="IDS_SETTINGS_AUTOFILL_TOGGLE_LABEL" desc="Label for a toggle that allows users to control whether forms should be autofilled with data such as addresses and credit cards, but not passwords.">
     Autofill forms
   </message>
-  <message name="IDS_SETTINGS_AUTOFILL_ENABLE_PROFILES_TOGGLE_LABEL" desc="Label for a toggle that allows users to control whether addresses should be saved and forms should be autofilled with them.">
-    Save and fill addresses
-  </message>
-  <message name="IDS_SETTINGS_AUTOFILL_ENABLE_CREDIT_CARDS_TOGGLE_LABEL" desc="Label for a toggle that allows users to control whether credit cards should be saved and forms should be autofilled with it.">
-    Save and fill payment methods
-  </message>
-  <message name="IDS_SETTINGS_AUTOFILL_ADDRESSES_HEADING" desc="Title for the list of addresses that chrome has saved for use in filling in forms.">
-    Addresses
-  </message>
   <message name="IDS_SETTINGS_AUTOFILL_ADDRESSES_ADD_TITLE" desc="This is the title for the 'Add address' dialog. This dialog allows a user to create a new address.">
     Add address
   </message>
@@ -663,9 +654,6 @@
   <message name="IDS_SETTINGS_AUTOFILL_CREDIT_CARD_DETAIL" desc="Description of what toggling the 'Credit card' setting does. Immediately underneath IDS_SETTINGS_AUTOFILL_CREDIT_CARD_HEADING.">
     Enable credit card Autofill to fill out forms in a single click
   </message>
-  <message name="IDS_SETTINGS_AUTOFILL_PAYMENT_METHODS" desc="Title for the list of saved payment methods that can be used to fill in forms.">
-    Payment methods
-  </message>
   <message name="IDS_SETTINGS_AUTOFILL_CREDIT_CARD_TYPE_COLUMN_LABEL" desc="Label for the column containing the type of credit card that is saved. The type is in the format: `Visa ****1234`.">
     Type
   </message>

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

@@ -1384,11 +1384,9 @@ void AddPasswordsAndFormsStrings(content::WebUIDataSource* html_source) {
       {"googlePayments", IDS_SETTINGS_GOOGLE_PAYMENTS},
       {"googlePaymentsCached", IDS_SETTINGS_GOOGLE_PAYMENTS_CACHED},
       {"autofillFormsLabel", IDS_SETTINGS_AUTOFILL_TOGGLE_LABEL},
-      {"enableProfilesLabel",
-       IDS_SETTINGS_AUTOFILL_ENABLE_PROFILES_TOGGLE_LABEL},
-      {"enableCreditCardsLabel",
-       IDS_SETTINGS_AUTOFILL_ENABLE_CREDIT_CARDS_TOGGLE_LABEL},
-      {"addresses", IDS_SETTINGS_AUTOFILL_ADDRESSES_HEADING},
+      {"enableProfilesLabel", IDS_AUTOFILL_ENABLE_PROFILES_TOGGLE_LABEL},
+      {"enableCreditCardsLabel", IDS_AUTOFILL_ENABLE_CREDIT_CARDS_TOGGLE_LABEL},
+      {"addresses", IDS_AUTOFILL_ADDRESSES},
       {"addAddressTitle", IDS_SETTINGS_AUTOFILL_ADDRESSES_ADD_TITLE},
       {"editAddressTitle", IDS_SETTINGS_AUTOFILL_ADDRESSES_EDIT_TITLE},
       {"addressCountry", IDS_SETTINGS_AUTOFILL_ADDRESSES_COUNTRY},
@@ -1460,7 +1458,7 @@ void AddPasswordsAndFormsStrings(content::WebUIDataSource* html_source) {
     html_source->AddLocalizedString("passwords",
                                     IDS_SETTINGS_PASSWORDS_AUTOFILL_HOME);
     html_source->AddLocalizedString("creditCards",
-                                    IDS_SETTINGS_AUTOFILL_PAYMENT_METHODS);
+                                    IDS_AUTOFILL_PAYMENT_METHODS);
     html_source->AddLocalizedString("noCreditCardsFound",
                                     IDS_SETTINGS_PAYMENT_METHODS_NONE);
   } else {

components/autofill_strings.grdp

@@ -444,6 +444,35 @@
     No saved addresses
   </message>
 
+  <!-- Autofill settings -->
+  <message name="IDS_AUTOFILL_ADDRESSES" desc="Title for the list of addresses that chrome has saved for use in filling in forms.">
+    Addresses
+  </message>
+  <if expr="not is_ios">
+    <then>
+      <message name="IDS_AUTOFILL_PAYMENT_METHODS" desc="Title for the list of saved payment methods that can be used to fill in forms. Sentence-Cased.">
+        Payment methods
+      </message>
+      <message name="IDS_AUTOFILL_ENABLE_PROFILES_TOGGLE_LABEL" desc="Label for a toggle that allows users to control whether addresses should be saved and forms should be autofilled with them. Sentence-Cased.">
+        Save and fill addresses
+      </message>
+      <message name="IDS_AUTOFILL_ENABLE_CREDIT_CARDS_TOGGLE_LABEL" desc="Label for a toggle that allows users to control whether credit cards should be saved and forms should be autofilled with it. Sentence-Cased.">
+        Save and fill payment methods
+      </message>
+    </then>
+    <else>
+      <message name="IDS_AUTOFILL_PAYMENT_METHODS" desc="Title for the list of saved payment methods that can be used to fill in forms. Title-Cased.">
+        Payment Methods
+      </message>
+      <message name="IDS_AUTOFILL_ENABLE_PROFILES_TOGGLE_LABEL" desc="Label for a toggle that allows users to control whether addresses should be saved and forms should be autofilled with them. Title-Cased.">
+        Save and Fill Addresses
+      </message>
+      <message name="IDS_AUTOFILL_ENABLE_CREDIT_CARDS_TOGGLE_LABEL" desc="Label for a toggle that allows users to control whether credit cards should be saved and forms should be autofilled with it. Title-Cased.">
+        Save and Fill Payment Methods
+      </message>
+    </else>
+  </if>
+
   <!-- Autofill/Wallet integration preferences -->
   <if expr="not is_ios">
     <then>