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

chrome/browser/cocoa/repost_form_warning_mac.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_COCOA_REPOST_FORM_WARNING_MAC_H_
 #define CHROME_BROWSER_COCOA_REPOST_FORM_WARNING_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/scoped_nsobject.h"
+#include "base/scoped_ptr.h"
 #include "chrome/browser/cocoa/constrained_window_mac.h"
 
 class RepostFormWarningController;
 
 // Displays a dialog that warns the user that they are about to resubmit
 // a form. To show the dialog, call the |Create| method. It will open the
 // dialog and then delete itself when the user dismisses the dialog.
 class RepostFormWarningMac : public ConstrainedDialogDelegate {
  public:
   // Convenience method that creates a new |RepostFormWarningController| and
   // then a new |RepostFormWarningMac| from that.
   static RepostFormWarningMac* Create(NSWindow* parent,
                                      TabContents* tab_contents);
 
   RepostFormWarningMac(NSWindow* parent,
                        RepostFormWarningController* controller);
 
   // ConstrainedWindowDelegateMacSystemSheet methods:
   virtual void DeleteDelegate();
 
  private:
   virtual ~RepostFormWarningMac();
 
-  // Close the sheet.
-  void Dismiss();
+  scoped_ptr<RepostFormWarningController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(RepostFormWarningMac);
 };
 
 #endif  // CHROME_BROWSER_COCOA_REPOST_FORM_WARNING_MAC_H_