RestoreTabHelper > SessionTabHelper, move more session stuff into it.

chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc

Index: chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc
diff --git a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc
index 68808bf33cf74d206e869813e43e08060e9418d5..59474bfc6f1043ca128f2e9390a641c70f4aa027 100644
--- a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc
+++ b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
 
 #include "chrome/browser/extensions/tab_helper.h"
-#include "chrome/browser/sessions/restore_tab_helper.h"
+#include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/navigation_controller.h"
@@ -21,11 +21,11 @@ TabContentsSyncedTabDelegate::TabContentsSyncedTabDelegate(
 TabContentsSyncedTabDelegate::~TabContentsSyncedTabDelegate() {}
 
 SessionID::id_type TabContentsSyncedTabDelegate::GetWindowId() const {
-  return tab_contents_->restore_tab_helper()->window_id().id();
+  return tab_contents_->session_tab_helper()->window_id().id();
 }
 
 SessionID::id_type TabContentsSyncedTabDelegate::GetSessionId() const {
-  return tab_contents_->restore_tab_helper()->session_id().id();
+  return tab_contents_->session_tab_helper()->session_id().id();
 }
 
 bool TabContentsSyncedTabDelegate::IsBeingDestroyed() const {