[Sync] Add logic to reassociate tab nodes after restart.

chrome/browser/sync/glue/session_model_associator.h

Index: chrome/browser/sync/glue/session_model_associator.h
diff --git a/chrome/browser/sync/glue/session_model_associator.h b/chrome/browser/sync/glue/session_model_associator.h
index 615a1d1d7d505f4a428999d6c0ba8c033681b3dd..3e3a503686853346ff50968e1a806754b7792f75 100644
--- a/chrome/browser/sync/glue/session_model_associator.h
+++ b/chrome/browser/sync/glue/session_model_associator.h
@@ -110,8 +110,7 @@ class SessionModelAssociator
   // |error| gets set if any association error occurred.
   // Returns: false if the local session's sync nodes were deleted and
   // reassociation is necessary, true otherwise.
-  bool AssociateTab(const SyncedTabDelegate& tab,
-                    syncer::SyncError* error);
+  bool AssociateTab(SyncedTabDelegate* tab, syncer::SyncError* error);

[Nicolas Zea, 2013/06/06 21:27:39]

comment that |tab| will be updated with the sync id if necessary

 
   // Load any foreign session info stored in sync db and update the sync db
   // with local client data. Processes/reuses any sync nodes owned by this
@@ -329,6 +328,10 @@ class SessionModelAssociator
   // invalid url's.
   bool TabHasValidEntry(const SyncedTabDelegate& tab) const;
 
+  // Update the tab id of the node with |sync_id| to |new_tab_id|. Returns true
+  // if tab id was set to |new_tab_id|.
+  bool UpdateTabIdIfNeccessary(int64 sync_id, SessionID::id_type new_tab_id);

[Nicolas Zea, 2013/06/06 21:27:39]

nit: neccessary only has one c

[shashi, 2013/06/11 19:15:06]

Done.

+
   // For testing only.
   void QuitLoopForSubtleTesting();