Revert "Revert 3 mac autofill CLs."

chrome/browser/resources/options/autofill_options.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /////////////////////////////////////////////////////////////////////////////
   // AutofillOptions class:
@@ skipping 37 matching lines @@
       var self = this;
       $('autofill-add-address').onclick = function(event) {
         self.showAddAddressOverlay_();
       };
       $('autofill-add-creditcard').onclick = function(event) {
         self.showAddCreditCardOverlay_();
       };
       $('autofill-options-confirm').onclick = function(event) {
         OptionsPage.closeOverlay();
       };
+<if expr="is_macosx">
+      $('autofill-use-mac-address-book-checkbox').onchange = function(event) {
+        if (this.checked) {
+          setTimeout(function() {
+            // Prompt the user to give Chrome access to the user's Address
+            // Book, if the user was not previously prompted. The dialog that
+            // appears blocks the Chrome process, so wait for a small period of
+            // time to allow the checkbox to appear filled in.
+            chrome.send('accessAddressBook');
+          }, 10);
+        }
+      };
+</if>
 
       // TODO(jhawkins): What happens when Autofill is disabled whilst on the
       // Autofill options page?
     },
 
     /**
      * Creates, decorates and initializes the address list.
      * @private
      */
     createAddressList_: function() {
@@ skipping 139 matching lines @@
     AutofillOptions.getInstance().showEditCreditCardOverlay_(creditCard);
   };
 
   // Export
   return {
     AutofillOptions: AutofillOptions
   };
 
 });