Remove observer from BrowsingDataRemover on destruct....

chrome/browser/dom_ui/clear_browser_data_handler.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/dom_ui/clear_browser_data_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/values.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
-ClearBrowserDataHandler::ClearBrowserDataHandler() {
+ClearBrowserDataHandler::ClearBrowserDataHandler() : remover_(NULL) {
 }
 
 ClearBrowserDataHandler::~ClearBrowserDataHandler() {
+  if (remover_) {
+    remover_->RemoveObserver(this);
+  }
 }
 
 void ClearBrowserDataHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   localized_strings->SetString(L"clearBrowsingDataTitle",
       l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_TITLE));
   localized_strings->SetString(L"clearBrowsingDataLabel",
       l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_LABEL));
   localized_strings->SetString(L"clearBrowsingDataTimeLabel",
@@ skipping 86 matching lines @@
 }
 
 void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() {
   // No need to remove ourselves as an observer as BrowsingDataRemover deletes
   // itself after we return.
   remover_ = NULL;
   DCHECK(dom_ui_);
   dom_ui_->CallJavascriptFunction(L"clearBrowserDataDismiss");
 }