Don't access owner() in the constructor; eventually doing this won't work, because InfoBarDelegates…

chrome/browser/ui/startup/session_crashed_prompt.cc

 // 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/startup/session_crashed_prompt.h"
 
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_restore.h"
@@ skipping 12 matching lines @@
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 // A delegate for the InfoBar shown when the previous session has crashed.
 class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate,
                                       public content::NotificationObserver {
  public:
-  explicit SessionCrashedInfoBarDelegate(InfoBarService* infobar_service);
+  SessionCrashedInfoBarDelegate(InfoBarService* infobar_service,
+                                Browser* browser);
 
  private:
   virtual ~SessionCrashedInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   content::NotificationRegistrar registrar_;
   bool accepted_;
   bool removed_notification_received_;
   Browser* browser_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionCrashedInfoBarDelegate);
 };
 
 SessionCrashedInfoBarDelegate::SessionCrashedInfoBarDelegate(
-    InfoBarService* infobar_service)
+    InfoBarService* infobar_service,
+    Browser* browser)
     : ConfirmInfoBarDelegate(infobar_service),
       accepted_(false),
       removed_notification_received_(false),
-      browser_(chrome::FindBrowserWithWebContents(owner()->GetWebContents())) {
+      browser_(browser) {
   // TODO(pkasting,marja): Once InfoBars own they delegates, this is not needed
   // any more. Then we can rely on delegates getting destroyed, and we can
   // initiate the session storage scavenging only in the destructor. (Currently,
   // info bars are leaked if they get closed while they're in background tabs.)
   registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
                  content::NotificationService::AllSources());
 }
 
 SessionCrashedInfoBarDelegate::~SessionCrashedInfoBarDelegate() {
   // If the info bar wasn't accepted, it was either dismissed or expired. In
@@ skipping 69 matching lines @@
       browser->tab_strip_model()->GetActiveWebContents();
   if (!tab)
     return;
 
   // Don't show the info-bar if there are already info-bars showing.
   InfoBarService* infobar_service = InfoBarService::FromWebContents(tab);
   if (infobar_service->GetInfoBarCount() > 0)
     return;
 
   infobar_service->AddInfoBar(
-      new SessionCrashedInfoBarDelegate(infobar_service));
+      new SessionCrashedInfoBarDelegate(infobar_service, browser));
 }
 
 }  // namespace chrome