RestoreTabHelper > SessionTabHelper, move more session stuff into it.

chrome/browser/sessions/session_id.cc

Index: chrome/browser/sessions/session_id.cc
diff --git a/chrome/browser/sessions/session_id.cc b/chrome/browser/sessions/session_id.cc
index 880f3cd4cf53fa31ae4b10c998a11ef882ac857d..80f690a83f0197dbf4640348da200dbff3cb7530 100644
--- a/chrome/browser/sessions/session_id.cc
+++ b/chrome/browser/sessions/session_id.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/sessions/session_id.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"
 
 static SessionID::id_type next_id = 1;
@@ -14,9 +14,9 @@ SessionID::SessionID() {
 }
 
 SessionID::id_type SessionID::IdForTab(const TabContents* tab) {
-  return tab ? tab->restore_tab_helper()->session_id().id() : -1;
+  return tab ? tab->session_tab_helper()->session_id().id() : -1;
 }
 
 SessionID::id_type SessionID::IdForWindowContainingTab(const TabContents* tab) {
-  return tab ? tab->restore_tab_helper()->window_id().id() : -1;
+  return tab ? tab->session_tab_helper()->window_id().id() : -1;
 }