Minor changes to still-unfinal chrome://settings/autofill wallet UI

chrome/browser/resources/options/autofill_options.html

 <div id="autofill-options" class="page" hidden>
   <div class="close-button"></div>
   <h1 i18n-content="autofillOptionsPage"></h1>
   <div class="content-area">
 <if expr="is_macosx">
     <div class="checkbox">
       <label>
         <input pref="autofill.use_mac_address_book" type="checkbox"
              id="autofill-use-mac-address-book-checkbox"
              metric="Options_AutofillAuxiliaryProfiles">
         <span i18n-content="auxiliaryProfilesEnabled"></span>
       </label>
     </div>
 </if>
+    <!-- TODO(estade): This section shouldn't show if you're not signed into
+         sync. Or perhaps it should show with a link to go sign in with sync?
+      -->
+    <div id="autofill-wallet-setting-area" class="settings-row" hidden>
+      <div class="checkbox">
+        <label>
+          <input pref="autofill.wallet_import_enabled" type="checkbox">
+          <span>
+            Include
+              <a target="_blank" i18n-values="href:manageWalletAddressesUrl">
+                  addresses</a>
+            and
+              <a target="_blank"
+                  i18n-values="href:manageWalletPaymentMethodsUrl">cards</a>
+            stored in your Google Wallet
+            <!-- A reminder not to launch this UI. -->
+            <span style="font-size: 80%">translate me!</span>
+          </span>
+      </div>
+    </div>
+
     <h3 i18n-content="autofillAddresses"></h3>
     <div class="settings-list">
       <list id="address-list"></list>
       <div>
         <button id="autofill-add-address" i18n-content="autofillAddAddress">
         </button>
       </div>
     </div>
+
     <h3 i18n-content="autofillCreditCards"></h3>
     <div class="settings-list">
       <list id="creditcard-list"></list>
       <div>
         <button id="autofill-add-creditcard"
             i18n-content="autofillAddCreditCard"></button>
       </div>
     </div>
-    <!-- TODO(estade): This section shouldn't show if you're not signed into
-         sync. -->
-    <div id="autofill-wallet-card-area" class="settings-row" hidden>
+
+    <!-- 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>Warning, these strings are not translated!</span>
-      <div>
-        Chrome will also suggest
-        <a target="_blank" i18n-values="href:manageWalletAddressesUrl">
-          addresses</a>
-        and
-        <a target="_blank" i18n-values="href:manageWalletPaymentMethodsUrl">
-          cards</a>
-        stored in your Wallet.
-      </div>
-      <div>
-        <span>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>
-      </div>
+      <span style="font-size: 80%">translate me!</span>
     </div>
   </div>
+
   <div class="action-area">
     <a id="autofill-help" target="_blank" i18n-values="href:helpUrl"
         i18n-content="helpButton">
     </a>
     <div class="spacer-div"></div>
     <div class="button-strip">
       <button id="autofill-options-confirm" class="default-button"
           i18n-content="done"></button>
     </div>
   </div>
 </div>