[sessions] Properly namespace recently-componentized TabRestore code

chrome/browser/jumplist_win.cc

Index: chrome/browser/jumplist_win.cc
diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc
index 8b5776822d8f8365a82789e2a7fed47132330bf8..ba78502d17eafa5540ab6590e9efcc81ac8ddc2e 100644
--- a/chrome/browser/jumplist_win.cc
+++ b/chrome/browser/jumplist_win.cc
@@ -203,7 +203,7 @@ JumpList::JumpList(Profile* profile)
   // When we add this object to the observer list, we save the pointer to this
   // TabRestoreService object. This pointer is used when we remove this object
   // from the observer list.
-  TabRestoreService* tab_restore_service =
+  sessions::TabRestoreService* tab_restore_service =
       TabRestoreServiceFactory::GetForProfile(profile_);
   if (!tab_restore_service)
     return;
@@ -262,7 +262,7 @@ void JumpList::CancelPendingUpdate() {
 void JumpList::Terminate() {
   CancelPendingUpdate();
   if (profile_) {
-    TabRestoreService* tab_restore_service =
+    sessions::TabRestoreService* tab_restore_service =
         TabRestoreServiceFactory::GetForProfile(profile_);
     if (tab_restore_service)
       tab_restore_service->RemoveObserver(this);
@@ -302,7 +302,7 @@ void JumpList::OnMostVisitedURLsAvailable(
   StartLoadingFavicon();
 }
 
-void JumpList::TabRestoreServiceChanged(TabRestoreService* service) {
+void JumpList::TabRestoreServiceChanged(sessions::TabRestoreService* service) {
   // if we have a pending handle request, cancel it here (it is out of date).
   CancelPendingUpdate();
 
@@ -321,17 +321,19 @@ void JumpList::TabRestoreServiceChanged(TabRestoreService* service) {
   // This code is copied from
   // RecentlyClosedTabsHandler::TabRestoreServiceChanged() to emulate it.
   const int kRecentlyClosedCount = 4;
-  TabRestoreService* tab_restore_service =
+  sessions::TabRestoreService* tab_restore_service =
       TabRestoreServiceFactory::GetForProfile(profile_);
-  const TabRestoreService::Entries& entries = tab_restore_service->entries();
-  for (TabRestoreService::Entries::const_iterator it = entries.begin();
+  const sessions::TabRestoreService::Entries& entries =
+      tab_restore_service->entries();
+  for (sessions::TabRestoreService::Entries::const_iterator it =
+           entries.begin();
        it != entries.end(); ++it) {
-    const TabRestoreService::Entry* entry = *it;
-    if (entry->type == TabRestoreService::TAB) {
-      AddTab(static_cast<const TabRestoreService::Tab*>(entry),
+    const sessions::TabRestoreService::Entry* entry = *it;
+    if (entry->type == sessions::TabRestoreService::TAB) {
+      AddTab(static_cast<const sessions::TabRestoreService::Tab*>(entry),
              &temp_list, kRecentlyClosedCount);
-    } else if (entry->type == TabRestoreService::WINDOW) {
-      AddWindow(static_cast<const TabRestoreService::Window*>(entry),
+    } else if (entry->type == sessions::TabRestoreService::WINDOW) {
+      AddWindow(static_cast<const sessions::TabRestoreService::Window*>(entry),
                 &temp_list, kRecentlyClosedCount);
     }
   }
@@ -345,10 +347,10 @@ void JumpList::TabRestoreServiceChanged(TabRestoreService* service) {
   StartLoadingFavicon();
 }
 
-void JumpList::TabRestoreServiceDestroyed(TabRestoreService* service) {
-}
+void JumpList::TabRestoreServiceDestroyed(
+    sessions::TabRestoreService* service) {}
 
-bool JumpList::AddTab(const TabRestoreService::Tab* tab,
+bool JumpList::AddTab(const sessions::TabRestoreService::Tab* tab,
                       ShellLinkItemList* list,
                       size_t max_items) {
   // This code adds the URL and the title strings of the given tab to the
@@ -369,7 +371,7 @@ bool JumpList::AddTab(const TabRestoreService::Tab* tab,
   return true;
 }
 
-void JumpList::AddWindow(const TabRestoreService::Window* window,
+void JumpList::AddWindow(const sessions::TabRestoreService::Window* window,
                          ShellLinkItemList* list,
                          size_t max_items) {
   // This code enumerates al the tabs in the given window object and add their