Fix a crash on WebViewFocusHelper destruction.

chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm

 // Copyright (c) 2012 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/ui/webui/constrained_web_dialog_delegate_base.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
@@ skipping 10 matching lines @@
 using ui::WebDialogWebContentsDelegate;
 using web_modal::NativeWebContentsModalDialog;
 
 namespace {
 
 class ConstrainedWebDialogDelegateMac
     : public ConstrainedWebDialogDelegateBase {
  public:
   ConstrainedWebDialogDelegateMac(
       content::BrowserContext* browser_context,
-      WebDialogDelegate* delegate,
-      WebDialogWebContentsDelegate* tab_delegate)
-      : ConstrainedWebDialogDelegateBase(
-            browser_context, delegate, tab_delegate) {}
+      WebDialogDelegate* delegate)
+      : ConstrainedWebDialogDelegateBase(browser_context, delegate, NULL) {}
 
   // WebDialogWebContentsDelegate interface.
   virtual void CloseContents(WebContents* source) OVERRIDE {
     window_->CloseWebContentsModalDialog();
   }
 
   void set_window(ConstrainedWindowMac* window) { window_ = window; }
   ConstrainedWindowMac* window() const { return window_; }
 
  private:
   // Weak, owned by ConstrainedWebDialogDelegateViewMac.
   ConstrainedWindowMac* window_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateMac);
 };
 
 }  // namespace
 
 class ConstrainedWebDialogDelegateViewMac :
     public ConstrainedWindowMacDelegate,
     public ConstrainedWebDialogDelegate {
 
  public:
   ConstrainedWebDialogDelegateViewMac(
       content::BrowserContext* browser_context,
       WebDialogDelegate* delegate,
-      WebDialogWebContentsDelegate* tab_delegate,
       content::WebContents* web_contents);
   virtual ~ConstrainedWebDialogDelegateViewMac() {}
 
   // ConstrainedWebDialogDelegate interface
   virtual const WebDialogDelegate*
       GetWebDialogDelegate() const OVERRIDE {
     return impl_->GetWebDialogDelegate();
   }
   virtual WebDialogDelegate* GetWebDialogDelegate() OVERRIDE {
     return impl_->GetWebDialogDelegate();
@@ skipping 23 matching lines @@
   scoped_ptr<ConstrainedWebDialogDelegateMac> impl_;
   scoped_ptr<ConstrainedWindowMac> constrained_window_;
   base::scoped_nsobject<NSWindow> window_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateViewMac);
 };
 
 ConstrainedWebDialogDelegateViewMac::ConstrainedWebDialogDelegateViewMac(
     content::BrowserContext* browser_context,
     WebDialogDelegate* delegate,
-    WebDialogWebContentsDelegate* tab_delegate,
     content::WebContents* web_contents)
-    : impl_(new ConstrainedWebDialogDelegateMac(browser_context,
-                                                delegate,
-                                                tab_delegate)) {
+    : impl_(new ConstrainedWebDialogDelegateMac(browser_context, delegate)) {
   // Create a window to hold web_contents in the constrained sheet:
   gfx::Size size;
   delegate->GetDialogSize(&size);
   NSRect frame = NSMakeRect(0, 0, size.width(), size.height());
 
   window_.reset(
       [[ConstrainedWindowCustomWindow alloc] initWithContentRect:frame]);
   [GetWebContents()->GetNativeView() setFrame:frame];
   [[window_ contentView] addSubview:GetWebContents()->GetNativeView()];
 
   base::scoped_nsobject<CustomConstrainedWindowSheet> sheet(
       [[CustomConstrainedWindowSheet alloc] initWithCustomWindow:window_]);
   constrained_window_.reset(new ConstrainedWindowMac(
       this, web_contents, sheet));
 
   impl_->set_window(constrained_window_.get());
 }
 
 ConstrainedWebDialogDelegate* CreateConstrainedWebDialog(
         content::BrowserContext* browser_context,
         WebDialogDelegate* delegate,
-        WebDialogWebContentsDelegate* tab_delegate,
         content::WebContents* web_contents) {
   // Deleted when the dialog closes.
   ConstrainedWebDialogDelegateViewMac* constrained_delegate =
       new ConstrainedWebDialogDelegateViewMac(
-          browser_context, delegate, tab_delegate, web_contents);
+          browser_context, delegate, web_contents);
   return constrained_delegate;
 }