Revert "[AF] Add cross-link to Privacy settings page in Payments settings page."

This reverts commit b5bd0713.

Reason for revert: It was decided to roll-back this change.

Original change's description:
> [AF] Add cross-link to Privacy settings page in Payments settings page.
> 
> Bug: 905114
> Change-Id: Ib8300998f6f183d7ffd0378ada0fbf02f118b9a2
> Reviewed-on: https://chromium-review.googlesource.com/c/1308769
> Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
> Commit-Queue: Sebastien Seguin-Gagnon <sebsg@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#609311}

TBR=dpapad@chromium.org,sebsg@chromium.org

Change-Id: I100c8a76ca9dbd64aa4b6d0113dde027b9d47bf4
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 905114
Reviewed-on: https://chromium-review.googlesource.com/c/1343290Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Commit-Queue: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609442}

chrome/app/settings_strings.grdp

@@ -752,9 +752,6 @@
   <message name="IDS_SETTINGS_CREDIT_CARD_EXPIRED" desc="The error message that is shown when user attempts to enter or save an expired card.">
     Your card is expired
   </message>
-  <message name="IDS_SETTINGS_PAYMENTS_PAGE_PRIVACY_LINK_TEXT" desc="The link text of the cross-link to the privacy settings page.">
-    To save payment methods to this device only, add them on this page, or visit <ph name="BEGIN_LINK_CHROMIUM">&lt;a target="_blank" href="$1"&gt;</ph>Privacy &amp; Security settings<ph name="END_LINK_CHROMIUM">&lt;/a&gt;</ph> and turn off the setting "Allow Chrome sign-in"
-  </message>
   <message name="IDS_SETTINGS_PASSWORDS" desc="Name for the password section and toggle">
     Manage passwords
   </message>

chrome/browser/resources/settings/passwords_and_forms_page/payments_section.html

@@ -42,7 +42,7 @@
       }
     </style>
     <settings-toggle-button id="autofillCreditCardToggle"
-        class="settings-box first list-item"
+        class="settings-box first"
         aria-label="$i18n{creditCards}" no-extension-indicator
         label="$i18n{enableCreditCardsLabel}"
         sub-label="$i18n{enableCreditCardsSublabel}"
@@ -61,12 +61,6 @@
         </extension-controlled-indicator>
       </div>
     </template>
-
-    <div class="settings-box list-item underbar" id="paymentsPagePrivacyLink"
-        hidden$="[[!showPaymentsPagePrivacyLinkText_]]">
-      <div>$i18nRaw{paymentsPagePrivacyLinkText}</div>
-    </div>
-
     <div class="settings-box continuation">
       <h2 class="start">$i18n{creditCards}</h2>
       <paper-button id="addCreditCard"

chrome/browser/resources/settings/passwords_and_forms_page/payments_section.js

@@ -204,18 +204,6 @@ Polymer({
       },
       readOnly: true,
     },
-
-    /**
-     * True when the payments privacy page link should be shown.
-     * @private {boolean}
-     */
-    showPaymentsPagePrivacyLinkText_: {
-      type: Boolean,
-      value: function() {
-        return loadTimeData.getBoolean('showPaymentsPagePrivacyLinkText');
-      },
-      readOnly: true,
-    },
   },
 
   listeners: {

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

@@ -1897,16 +1897,6 @@ void AddPeopleStrings(content::WebUIDataSource* html_source, Profile* profile) {
   html_source->AddBoolean("isAccountManagerEnabled",
                           chromeos::switches::IsAccountManagerEnabled());
 #endif
-
-  base::string16 payment_privacy_cross_link = l10n_util::GetStringFUTF16(
-      IDS_SETTINGS_PAYMENTS_PAGE_PRIVACY_LINK_TEXT,
-      base::ASCIIToUTF16(autofill::kPrivacySettingsURL));
-  html_source->AddString("paymentsPagePrivacyLinkText",
-                         payment_privacy_cross_link);
-  html_source->AddBoolean(
-      "showPaymentsPagePrivacyLinkText",
-      base::FeatureList::IsEnabled(
-          autofill::features::kAutofillEnableAccountWalletStorage));
 }
 
 void AddPrintingStrings(content::WebUIDataSource* html_source) {

chrome/test/data/webui/settings/payments_section_test.js

@@ -618,19 +618,5 @@ cr.define('settings_payments_section', function() {
       // All migration requirements are met, verify migration button is shown.
       assertFalse(section.$$('#migrateCreditCards').hidden);
     });
-
-    test('verifyPrivacyLinkHidden', function() {
-      // By default, the link should not be visible.
-      const section = createPaymentsSection([], {});
-
-      assertTrue(section.$$('#paymentsPagePrivacyLink').hidden);
-    });
-
-    test('verifyPrivacyLinkVisible', function() {
-      loadTimeData.overrideValues({showPaymentsPagePrivacyLinkText: true});
-      const section = createPaymentsSection([], {});
-
-      assertFalse(section.$$('#paymentsPagePrivacyLink').hidden);
-    });
   });
 });

components/autofill/core/common/autofill_constants.cc

@@ -18,8 +18,6 @@ const char kHelpURL[] =
 
 const char kSettingsOrigin[] = "Chrome settings";
 
-const char kPrivacySettingsURL[] = "chrome://settings/privacy";
-
 size_t MinRequiredFieldsForHeuristics() {
   return base::FeatureList::IsEnabled(
              autofill::features::kAutofillEnforceMinRequiredFieldsForHeuristics)

components/autofill/core/common/autofill_constants.h

@@ -17,9 +17,6 @@ extern const char kHelpURL[];
 // The origin of an AutofillDataModel created or modified in the settings page.
 extern const char kSettingsOrigin[];
 
-// The privacy page URL of the chrome settings.
-extern const char kPrivacySettingsURL[];
-
 // The number of fields required by Autofill to execute its heuristic and
 // crowd-sourcing query/upload routines.
 size_t MinRequiredFieldsForHeuristics();