[Sync] Add per-navigation timestamps/unique ids to tab sync.

chrome/browser/sync/glue/synced_session_tracker.cc

 // Copyright (c) 2011 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.
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/sync/glue/synced_session_tracker.h"
 
 namespace browser_sync {
 
@@ skipping 49 matching lines @@
            iter->second->windows.begin();
        window_iter != iter->second->windows.end(); window_iter++) {
     windows->push_back(window_iter->second);
   }
   return true;
 }
 
 bool SyncedSessionTracker::LookupSessionTab(
     const std::string& tag,
     SessionID::id_type tab_id,
-    const SessionTab** tab) const {
+    const SyncedSessionTab** tab) const {
   DCHECK(tab);
   SyncedTabMap::const_iterator tab_map_iter = synced_tab_map_.find(tag);
   if (tab_map_iter == synced_tab_map_.end()) {
     // We have no record of this session.
     *tab = NULL;
     return false;
   }
   IDToSessionTabMap::const_iterator tab_iter =
       tab_map_iter->second.find(tab_id);
   if (tab_iter == tab_map_iter->second.end()) {
@@ skipping 77 matching lines @@
     delete window_wrapper.window_ptr;
     return true;
   }
   return false;
 }
 
 bool SyncedSessionTracker::DeleteOldSessionTabIfNecessary(
     SessionTabWrapper tab_wrapper) {
   if (!tab_wrapper.owned) {
     if (VLOG_IS_ON(1)) {
-      SessionTab* tab_ptr = tab_wrapper.tab_ptr;
+      SyncedSessionTab* tab_ptr = tab_wrapper.tab_ptr;
       std::string title;
       if (tab_ptr->navigations.size() > 0) {
         title = " (" + UTF16ToUTF8(
             tab_ptr->navigations[tab_ptr->navigations.size()-1].title()) + ")";
       }
       DVLOG(1) << "Deleting closed tab " << tab_ptr->tab_id.id() << title
                << " from window " << tab_ptr->window_id.id();
     }
     unmapped_tabs_.erase(tab_wrapper.tab_ptr);
     delete tab_wrapper.tab_ptr;
@@ skipping 53 matching lines @@
   DCHECK(window_ptr);
   DCHECK_EQ(window_ptr->window_id.id(), window_id);
   DCHECK_EQ((SessionWindow*)NULL, GetSession(session_tag)->windows[window_id]);
   GetSession(session_tag)->windows[window_id] = window_ptr;
 }
 
 void SyncedSessionTracker::PutTabInWindow(const std::string& session_tag,
                                           SessionID::id_type window_id,
                                           SessionID::id_type tab_id,
                                           size_t tab_index) {
-  SessionTab* tab_ptr = GetTab(session_tag, tab_id);
+  SyncedSessionTab* tab_ptr = GetTab(session_tag, tab_id);
   unmapped_tabs_.erase(tab_ptr);
   synced_tab_map_[session_tag][tab_id].owned = true;
   tab_ptr->window_id.set_id(window_id);
   DVLOG(1) << "  - tab " << tab_id << " added to window "<< window_id;
   DCHECK(GetSession(session_tag)->windows.find(window_id) !=
          GetSession(session_tag)->windows.end());
   std::vector<SessionTab*>& window_tabs =
       GetSession(session_tag)->windows[window_id]->tabs;
   if (window_tabs.size() <= tab_index) {
     window_tabs.resize(tab_index+1, NULL);
   }
-  DCHECK_EQ((SessionTab*)NULL, window_tabs[tab_index]);
+  DCHECK_EQ((SyncedSessionTab*)NULL, window_tabs[tab_index]);
   window_tabs[tab_index] = tab_ptr;
 }
 
-SessionTab* SyncedSessionTracker::GetTab(
+SyncedSessionTab* SyncedSessionTracker::GetTab(
     const std::string& session_tag,
     SessionID::id_type tab_id) {
-  SessionTab* tab_ptr = NULL;
+  SyncedSessionTab* tab_ptr = NULL;
   IDToSessionTabMap::iterator iter =
       synced_tab_map_[session_tag].find(tab_id);
   if (iter != synced_tab_map_[session_tag].end()) {
     tab_ptr = iter->second.tab_ptr;
     if (VLOG_IS_ON(1)) {
       std::string title;
       if (tab_ptr->navigations.size() > 0) {
         title = " (" + UTF16ToUTF8(
             tab_ptr->navigations[tab_ptr->navigations.size()-1].title()) + ")";
       }
       DVLOG(1) << "Getting "
                << (session_tag == local_session_tag_ ?
                    "local session" : session_tag)
                << "'s seen tab " << tab_id  << " at " << tab_ptr << title;
     }
   } else {
-    tab_ptr = new SessionTab();
+    tab_ptr = new SyncedSessionTab();
     tab_ptr->tab_id.set_id(tab_id);
     synced_tab_map_[session_tag][tab_id] = SessionTabWrapper(tab_ptr, false);
     unmapped_tabs_.insert(tab_ptr);
     DVLOG(1) << "Getting "
              << (session_tag == local_session_tag_ ?
                  "local session" : session_tag)
              << "'s new tab " << tab_id  << " at " << tab_ptr;
   }
   DCHECK(tab_ptr);
   DCHECK_EQ(tab_ptr->tab_id.id(), tab_id);
@@ skipping 13 matching lines @@
 
   // Get rid of our Window/Tab maps (does not delete the actual Window/Tabs
   // themselves; they should have all been deleted above).
   synced_window_map_.clear();
   synced_tab_map_.clear();
 
   local_session_tag_.clear();
 }
 
 }  // namespace browser_sync