Revamp TabNavigation class

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 76a1fb8f1a2e9cc95b79b0bea99efe0b6af78eef..577b7cf8fd8041d00030bd0f6861e7ffd227fb53 100644
--- a/chrome/browser/sync/glue/session_model_associator.h
+++ b/chrome/browser/sync/glue/session_model_associator.h
@@ -422,7 +422,7 @@ class SessionModelAssociator
   // |new_url| will be the tab's current url.
   void AssociateTabContents(const SyncedWindowDelegate& window,
                             const SyncedTabDelegate& new_tab,
-                            SyncedSessionTab* prev_tab,
+                            SessionTab* prev_tab,
                             sync_pb::SessionTab* sync_tab,
                             GURL* new_url);
 
@@ -456,23 +456,13 @@ class SessionModelAssociator
   // Used to populate a session tab from the session specifics tab provided.
   static void PopulateSessionTabFromSpecifics(const sync_pb::SessionTab& tab,
                                               const base::Time& mtime,
-                                              SyncedSessionTab* session_tab);
+                                              SessionTab* session_tab);
 
   // Helper method to load the favicon data from the tab specifics. If the
   // favicon is valid, stores the favicon data and increments the usage counter
   // in |synced_favicons_| and updates |synced_favicon_pages_| appropriately.
   void LoadForeignTabFavicon(const sync_pb::SessionTab& tab);
 
-  // Append a new navigation from sync specifics onto |tab| navigation vectors.
-  static void AppendSessionTabNavigation(
-     const sync_pb::TabNavigation& navigation,
-     SyncedSessionTab* tab);
-
-  // Populates the navigation portion of the session specifics.
-  static void PopulateSessionSpecificsNavigation(
-     const content::NavigationEntry& navigation,
-     sync_pb::TabNavigation* tab_navigation);
-
   // Returns true if this tab belongs to this profile and belongs to a window,
   // false otherwise.
   bool IsValidTab(const SyncedTabDelegate& tab) const;