| Index: chrome/browser/sync/glue/session_model_associator.cc
|
| diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc
|
| index 2bed2ae65092728e2ad5ce3cae9af82dadfb1006..ce0ab4cc6562a9e69b029d5a8627a6ee89601cd9 100644
|
| --- a/chrome/browser/sync/glue/session_model_associator.cc
|
| +++ b/chrome/browser/sync/glue/session_model_associator.cc
|
| @@ -213,10 +213,10 @@ bool SessionModelAssociator::AssociateWindows(bool reload_tabs,
|
|
|
| if (reload_tabs) {
|
| SyncedTabDelegate* tab = (*i)->GetTabAt(j);
|
| - // It's possible for GetTabAt to return a null tab if it's not in
|
| - // memory. We can assume this means the tab already existed but hasn't
|
| - // changed, so no need to reassociate.
|
| - if (tab && !AssociateTab(*tab, error)) {
|
| + // It's possible for GetTabAt to return a tab which has no web
|
| + // contents. We can assume this means the tab already existed but
|
| + // hasn't changed, so no need to reassociate.
|
| + if (tab->HasWebContents() && !AssociateTab(*tab, error)) {
|
| // Association failed. Either we need to re-associate, or this is an
|
| // unrecoverable error.
|
| return false;
|
|
|