Revert "Revert 3 mac autofill CLs."

chrome/browser/ui/webui/options/autofill_options_handler.h

Index: chrome/browser/ui/webui/options/autofill_options_handler.h
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.h b/chrome/browser/ui/webui/options/autofill_options_handler.h
index a98a98639e47456a3d5fba039d179f14d9f44a3e..bd7a100175bb2733beb01b6ed8ec7e7098735b6c 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.h
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.h
@@ -46,6 +46,13 @@ class AutofillOptionsHandler : public OptionsPageUIHandler,
   // Loads Autofill addresses and credit cards using the PersonalDataManager.
   void LoadAutofillData();
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  // The user wants to grant Chrome access to the user's Address Book.
+  // Immediately try to access the Address Book so that the blocking dialog is
+  // shown in context, rather than at a later, surprising time.
+  void AccessAddressBook(const base::ListValue* args);
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
+
   // Removes data from the PersonalDataManager.
   // |args| - A string, the GUID of the address or credit card to remove.
   void RemoveData(const base::ListValue* args);