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

chrome/browser/sync/glue/session_model_associator.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 92 matching lines @@
   // Returns: false if the local session's sync nodes were deleted and
   // reassociation is necessary, true otherwise.
   bool AssociateTabs(const std::vector<SyncedTabDelegate*>& tabs,
                      syncer::SyncError* error);
 
   // Reassociates a single tab with the sync model. Will check if the tab
   // already is associated with a sync node and allocate one if necessary.
   // |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
   // client and creates any further sync nodes needed to store local header and
   // tab info.
   virtual syncer::SyncError AssociateModels(
       syncer::SyncMergeResult* local_merge_result,
       syncer::SyncMergeResult* syncer_merge_result) OVERRIDE;
 
   // Clear local sync data buffers. Does not delete sync nodes to avoid
@@ skipping 197 matching lines @@
   // Returns true if this tab belongs to this profile and belongs to a window,
   // false otherwise.
   bool IsValidTab(const SyncedTabDelegate& tab) const;
 
   // Having a valid entry is defined as the url being valid and and having a
   // syncable scheme (non chrome:// and file:// url's). In other words, we don't
   // want to sync a tab that is nothing but chrome:// and file:// navigations or
   // 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();
 
   // Unique client tag.
   std::string current_machine_tag_;
 
   // User-visible machine name.
   std::string current_session_name_;
 
   // Pool of all used/available sync nodes associated with tabs.
@@ skipping 30 matching lines @@
 
   // Our favicon cache.
   FaviconCache favicon_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SESSION_MODEL_ASSOCIATOR_H_