Revamp desktop Autofill settings, round 2

chrome/browser/resources/options/autofill_options.html

Index: chrome/browser/resources/options/autofill_options.html
diff --git a/chrome/browser/resources/options/autofill_options.html b/chrome/browser/resources/options/autofill_options.html
index 4e6041077441179b84ea4a46c9d89a177c519bd1..850e54f0939790f4203611a68189180e99a21e9a 100644
--- a/chrome/browser/resources/options/autofill_options.html
+++ b/chrome/browser/resources/options/autofill_options.html
@@ -6,7 +6,7 @@
       <label>
         <input pref="autofill.wallet_import_enabled" type="checkbox">
         <span>
-          Show addresses and credit cards from Google Payments
+          Suggest addresses and credit cards from Google Wallet
           <!-- A reminder not to launch this UI. -->
           <span style="font-size: 80%">translate me!</span>
         </span>
@@ -41,18 +41,6 @@
             i18n-content="autofillAddCreditCard"></button>
       </div>
     </div>
-
-    <!-- TODO(estade): what do we do with this section when the pref is unset?
-      -->
-    <div id="autofill-wallet-remask-cards-area">
-      <span class="settings-row">Credit cards from Wallet require authentication
-          once and then remain unlocked.
-      </span>
-      <a id="remask-server-cards-link"
-          is="action-link">Reset authenticated cards</a>
-      <!-- A reminder not to launch this UI. -->
-      <span style="font-size: 80%">translate me!</span>
-    </div>
   </div>
 
   <div class="action-area">