3 files changed, 11 insertions, 3 deletions
diff --git a/chrome/app/keystone_glue.m b/chrome/app/keystone_glue.m
index 0ebf7998..86f48ce 100644
--- a/chrome/app/keystone_glue.m
+++ b/chrome/app/keystone_glue.m
@@ -73,6 +73,7 @@ NSString *KSRegistrationRemoveExistingTag = @"";
   [version_ release];
   [channel_ release];
   [registration_ release];
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index 4ca90df..d632046 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -184,9 +184,6 @@ AutocompleteEditViewMac::~AutocompleteEditViewMac() {
   // Disconnect field_ from edit_helper_ so that we don't get calls
   // after destruction.
   [field_ setDelegate:nil];
-
-  // Disconnect notifications so they don't signal a dead object.
-  [[NSNotificationCenter defaultCenter] removeObserver:edit_helper_];
 }
 
 void AutocompleteEditViewMac::SaveStateToTab(TabContents* tab) {
@@ -721,6 +718,11 @@ std::wstring AutocompleteEditViewMac::GetClipboardText(Clipboard* clipboard) {
   return self;
 }
 
+- (void)dealloc {
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+  [super dealloc];
+}
+
 - (BOOL)control:(NSControl*)control
        textView:(NSTextView*)textView doCommandBySelector:(SEL)cmd {
   // Don't intercept up/down-arrow if the popup isn't open.
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
index 00d27ce..3553072 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
@@ -673,6 +673,11 @@ void AutocompletePopupViewMac::OnMiddleClick() {
   return self;
 }
 
+- (void)dealloc {
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+  [super dealloc];
+}
+
 - (void)select:(id)sender {
   DCHECK(popup_view_);
   popup_view_->AcceptInput();