patched from issue 334653006, modified

chrome/browser/ui/autofill/chrome_autofill_client.cc

Index: chrome/browser/ui/autofill/chrome_autofill_client.cc
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc
index 945cee7fa6c2fdc51f9c840ed5346af8e6661a3a..a0da3329a1e002723e90746a22aa1db26ddae37b 100644
--- a/chrome/browser/ui/autofill/chrome_autofill_client.cc
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc
@@ -37,6 +37,9 @@ namespace autofill {
 ChromeAutofillClient::ChromeAutofillClient(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents), web_contents_(web_contents) {
   DCHECK(web_contents);
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  RegisterForKeystoneNotifications();
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 }
 
 ChromeAutofillClient::~ChromeAutofillClient() {
@@ -45,6 +48,10 @@ ChromeAutofillClient::~ChromeAutofillClient() {
   // this point (in particular, the WebContentsImpl destructor has already
   // finished running and we are now in the base class destructor).
   DCHECK(!popup_controller_);
+
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  UnregisterFromKeystoneNotifications();
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 }
 
 void ChromeAutofillClient::TabActivated() {