diff options
| author | mal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-03 23:27:14 +0000 |
|---|---|---|
| committer | mal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-03 23:27:14 +0000 |
| commit | ab31a479043e92cb11d5aa6167e18459c80f6594 (patch) | |
| tree | 8fe153aac583a171afb0fbf97ca349284def0f44 /chrome/browser/browser_init.cc | |
| parent | 3386fbe6b3b67c3783ad220c45ce0019c85b52b9 (diff) | |
| download | chromium_src-ab31a479043e92cb11d5aa6167e18459c80f6594.zip chromium_src-ab31a479043e92cb11d5aa6167e18459c80f6594.tar.gz chromium_src-ab31a479043e92cb11d5aa6167e18459c80f6594.tar.bz2 | |
Blind fix for ChromeBot crashes.
A ChromeBot run for 172.17 was very top heavy (77/103 crashes) with:
[vector:703] std::vector<PasswordManagerTableModel::PasswordRow
*,std::allocator<PasswordManagerTableModel::PasswordRow *> >::size()
[browser_init.cc:140] `anonymous namespace'::NotifyNotDefaultBrowserTask::Run()
[message_loop.cc:308] MessageLoop::RunTask(Task *)
I'm going to try a null check on |tab| before we invoke
tab->infobar_delegate_count().
This applies the change made to 172 to trunk.
TBR= jcampan,ben
BUG= 11388
Review URL: http://codereview.chromium.org/99331
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
| -rw-r--r-- | chrome/browser/browser_init.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 3ca6020..d0a8d14 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -140,7 +140,9 @@ class NotifyNotDefaultBrowserTask : public Task { } TabContents* tab = browser->GetSelectedTabContents(); // Don't show the info-bar if there are already info-bars showing. - if (tab->infobar_delegate_count() > 0) + // In ChromeBot tests, there might be a race. This line appears to get + // called during shutdown and |tab| can be NULL. + if (!tab || tab->infobar_delegate_count() > 0) return; tab->AddInfoBar(new DefaultBrowserInfoBarDelegate(tab)); } |