Merge 44481 - Ensure proper teardown of repost form warning objects....

chrome/browser/gtk/repost_form_warning_gtk.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/gtk/repost_form_warning_gtk.h"
 
 #include "app/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "chrome/browser/gtk/gtk_util.h"
@@ skipping 47 matching lines @@
                    G_CALLBACK(OnHierarchyChangedThunk), this);
 
   controller_->Show(this);
 }
 
 GtkWidget* RepostFormWarningGtk::GetWidgetRoot() {
   return dialog_;
 }
 
 void RepostFormWarningGtk::DeleteDelegate() {
-  Dismiss();
   delete this;
 }
 
 RepostFormWarningGtk::~RepostFormWarningGtk() {
-}
-
-void RepostFormWarningGtk::Dismiss() {
-  if (dialog_) {
-    gtk_widget_destroy(dialog_);
-    dialog_ = NULL;
-  }
+  gtk_widget_destroy(dialog_);
 }
 
 void RepostFormWarningGtk::OnRefresh(GtkWidget* widget) {
   controller_->Continue();
 }
 
 void RepostFormWarningGtk::OnCancel(GtkWidget* widget) {
   controller_->Cancel();
 }
 
 void RepostFormWarningGtk::OnHierarchyChanged(GtkWidget* root,
                                               GtkWidget* previous_toplevel) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   if (!GTK_WIDGET_TOPLEVEL(gtk_widget_get_toplevel(cancel_))) {
     return;
   }
   gtk_widget_grab_focus(cancel_);
 }