Fixes crash when clicking session restore button on info bar. The

chrome/browser/ui/browser_init.cc

 // Copyright (c) 2011 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/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 280 matching lines @@
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           new NotifyNotDefaultBrowserTask());
 }
 
 
 // SessionCrashedInfoBarDelegate ----------------------------------------------
 
 // A delegate for the InfoBar shown when the previous session has crashed.
 class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
-  SessionCrashedInfoBarDelegate(Browser* browser, TabContents* contents);
+  SessionCrashedInfoBarDelegate(Profile* profile, TabContents* contents);
 
  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;
 
-  Browser* browser_;
-
   // The Profile that we restore sessions from.
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionCrashedInfoBarDelegate);
 };
 
 SessionCrashedInfoBarDelegate::SessionCrashedInfoBarDelegate(
-    Browser* browser,
+    Profile* profile,
     TabContents* contents)
     : ConfirmInfoBarDelegate(contents),
-      browser_(browser),
-      profile_(Profile::FromBrowserContext(contents->browser_context())) {
+      profile_(profile) {
 }
 
 SessionCrashedInfoBarDelegate::~SessionCrashedInfoBarDelegate() {
 }
 
 gfx::Image* SessionCrashedInfoBarDelegate::GetIcon() const {
   return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_INFOBAR_RESTORE_SESSION);
 }
 
 string16 SessionCrashedInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_SESSION_CRASHED_VIEW_MESSAGE);
 }
 
 int SessionCrashedInfoBarDelegate::GetButtons() const {
   return BUTTON_OK;
 }
 
 string16 SessionCrashedInfoBarDelegate::GetButtonLabel(
     InfoBarButton button) const {
   DCHECK_EQ(BUTTON_OK, button);
   return l10n_util::GetStringUTF16(IDS_SESSION_CRASHED_VIEW_RESTORE_BUTTON);
 }
 
 bool SessionCrashedInfoBarDelegate::Accept() {
   uint32 behavior = 0;
-  if (browser_->tab_count() == 1 && browser_->GetTabContentsAt(0)->GetURL() ==
+  Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
+  if (browser && browser->tab_count() == 1
+      && browser->GetTabContentsAt(0)->GetURL() ==
       GURL(chrome::kChromeUINewTabURL)) {
     // There is only one tab and its the new tab page, make session restore
     // clobber it.
     behavior = SessionRestore::CLOBBER_CURRENT_TAB;
   }
   SessionRestore::RestoreSession(
-      profile_, browser_, behavior, std::vector<GURL>());
+      profile_, browser, behavior, std::vector<GURL>());
   return true;
 }
 
 
 // Utility functions ----------------------------------------------------------
 
 bool IncognitoIsForced(const CommandLine& command_line,
                        const PrefService* prefs) {
   IncognitoModePrefs::Availability incognito_avail =
       IncognitoModePrefs::GetAvailability(prefs);
@@ skipping 707 matching lines @@
   AddBadFlagsInfoBarIfNecessary(tab_contents);
   AddDNSCertProvenanceCheckingWarningInfoBarIfNecessary(tab_contents);
   AddObsoleteSystemInfoBarIfNecessary(tab_contents);
 }
 
 void BrowserInit::LaunchWithProfile::AddCrashedInfoBarIfNecessary(
     Browser* browser,
     TabContentsWrapper* tab) {
   // Assume that if the user is launching incognito they were previously
   // running incognito so that we have nothing to restore from.
-  if (!profile_->DidLastSessionExitCleanly() &&
-      !profile_->IsOffTheRecord()) {
+  if (!profile_->DidLastSessionExitCleanly() && !profile_->IsOffTheRecord()) {
     // The last session didn't exit cleanly. Show an infobar to the user
     // so that they can restore if they want. The delegate deletes itself when
     // it is closed.
     tab->AddInfoBar(
-        new SessionCrashedInfoBarDelegate(browser, tab->tab_contents()));
+        new SessionCrashedInfoBarDelegate(profile_, tab->tab_contents()));
   }
 }
 
 void BrowserInit::LaunchWithProfile::AddBadFlagsInfoBarIfNecessary(
     TabContentsWrapper* tab) {
   // Unsupported flags for which to display a warning that "stability and
   // security will suffer".
   static const char* kBadFlags[] = {
     // These imply disabling the sandbox.
     switches::kSingleProcess,
@@ skipping 375 matching lines @@
     return false;
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 
   return true;
 }