RestoreTabHelper > SessionTabHelper, move more session stuff into it.

chrome/browser/extensions/extension_keybinding_apitest.cc

Index: chrome/browser/extensions/extension_keybinding_apitest.cc
diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc
index f66230675c7041b5796b49d458247681f3a6fb48..14e2a04814f4246b61b4029073e70dcf4022805d 100644
--- a/chrome/browser/extensions/extension_keybinding_apitest.cc
+++ b/chrome/browser/extensions/extension_keybinding_apitest.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
-#include "chrome/browser/sessions/restore_tab_helper.h"
+#include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ -115,7 +115,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, PageAction) {
 
   // Make sure it appears and is the right one.
   ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1));
-  int tab_id = chrome::GetActiveTabContents(browser())->restore_tab_helper()->
+  int tab_id = chrome::GetActiveTabContents(browser())->session_tab_helper()->
       session_id().id();
   ExtensionAction* action = extension->page_action();
   ASSERT_TRUE(action);