Chromium Code Reviews| Index: chrome/browser/sync/glue/session_change_processor.cc |
| diff --git a/chrome/browser/sync/glue/session_change_processor.cc b/chrome/browser/sync/glue/session_change_processor.cc |
| index dd3ed78193bd40d6aae5388a67625892df6477cc..df6d7b565ef13e4dd3f47d73307cb240fb3da993 100644 |
| --- a/chrome/browser/sync/glue/session_change_processor.cc |
| +++ b/chrome/browser/sync/glue/session_change_processor.cc |
| @@ -214,24 +214,23 @@ void SessionChangeProcessor::Observe( |
| // Note that if we fail to associate, it means something has gone wrong, |
| // such as our local session being deleted, so we disassociate and associate |
| // again. |
| - SyncError error; |
| bool reassociation_needed = !modified_tabs.empty() && |
| - !session_model_associator_->AssociateTabs(modified_tabs, &error); |
| + !session_model_associator_->AssociateTabs(modified_tabs, NULL); |
| // Note, we always associate windows because it's possible a tab became |
| // "interesting" by going to a valid URL, in which case it needs to be added |
| // to the window's tab information. |
| if (!reassociation_needed) { |
| reassociation_needed = |
| - !session_model_associator_->AssociateWindows(false, &error); |
| + !session_model_associator_->AssociateWindows(false, NULL); |
| } |
| if (reassociation_needed) { |
| LOG(WARNING) << "Reassociation of local models triggered."; |
| // Needing to reassociate would have set the error already so clear it. |
|
Nicolas Zea
2012/04/05 22:08:58
remove comment.
lipalani1
2012/04/05 22:51:03
Done.
|
| - error = SyncError(); |
| - session_model_associator_->DisassociateModels(&error); |
| - session_model_associator_->AssociateModels(&error); |
| + SyncError error; |
| + error = session_model_associator_->DisassociateModels(); |
| + error = session_model_associator_->AssociateModels(); |
| if (error.IsSet()) { |
| error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE, |
| "Sessions reassociation failed."); |