Do not submit: high level overview patch.

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 6d8fbdd49e6a6234efad6937b68412a03f6c1e62..d494b87c7d9a5b1ba4d37d016a97809001cd9862 100644
--- a/chrome/browser/sync/glue/session_model_associator.h
+++ b/chrome/browser/sync/glue/session_model_associator.h
@@ -24,6 +24,7 @@
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "chrome/browser/sync/glue/synced_session_tracker.h"
 #include "chrome/browser/sync/glue/tab_node_pool.h"
+
 #include "sync/internal_api/public/base/model_type.h"
 
 class PrefServiceSyncable;
@@ -129,8 +130,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);
 
   // 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
@@ -318,6 +318,8 @@ class SessionModelAssociator
   bool WriteTabContentsToSyncModel(TabLink* tab_link,
                                    syncer::SyncError* error);
 
+  void UpdateTabIdForOldTab(int64 sync_id, SessionID::id_type new_tab_id);
+
   // Set |session_tab| from |tab_delegate| and |mtime|.
   static void SetSessionTabFromDelegate(
       const SyncedTabDelegate& tab_delegate,
@@ -357,6 +359,8 @@ class SessionModelAssociator
   // For testing only.
   void QuitLoopForSubtleTesting();
 
+  void NotifySyncIdGenerated(const SyncedTabDelegate& tab);
+
   // Unique client tag.
   std::string current_machine_tag_;