[Sync] Handle reassociation of tabs where the old tab is already mapped.

components/sync_sessions/synced_session_tracker.h

Index: components/sync_sessions/synced_session_tracker.h
diff --git a/components/sync_sessions/synced_session_tracker.h b/components/sync_sessions/synced_session_tracker.h
index f0324796f48eab6679a5f3789e0ebd206995287d..19e00dd7aa5ad6bf7d5c3824794e363bdb63cfa3 100644
--- a/components/sync_sessions/synced_session_tracker.h
+++ b/components/sync_sessions/synced_session_tracker.h
@@ -174,6 +174,10 @@ class SyncedSessionTracker {
   // any previous SessionTab object the node was associated with. This is useful
   // on restart when sync needs to reassociate tabs from a previous session with
   // newly restored tabs (and can be used in conjunction with PutTabInWindow).
+  // If |new_tab_id| is already associated with a tab object, that tab will be
+  // overwritten.

[skym, 2017/05/04 20:07:20]

Did you mean to newline so early here?

[Nicolas Zea, 2017/05/04 23:36:15]

Done.

+  // Reassociating a tab with a node it is already mapped to will have no
+  // effect.
   void ReassociateLocalTab(int tab_node_id, SessionID::id_type new_tab_id);
 
   // **** Methods for querying/manipulating overall state ****.