RestoreTabHelper > SessionTabHelper, move more session stuff into it.

chrome/browser/ui/tab_contents/tab_contents.h

Index: chrome/browser/ui/tab_contents/tab_contents.h
diff --git a/chrome/browser/ui/tab_contents/tab_contents.h b/chrome/browser/ui/tab_contents/tab_contents.h
index cd27fc5383d232949a2cba2af6888504cd7baa95..54ff3cb1231362f5379bad4f5458dafef4d56dae 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.h
+++ b/chrome/browser/ui/tab_contents/tab_contents.h
@@ -51,9 +51,9 @@ class PDFTabObserver;
 class PluginObserver;
 class PrefsTabHelper;
 class Profile;
-class RestoreTabHelper;
 class SadTabHelper;
 class SearchEngineTabHelper;
+class SessionTabHelper;
 class ShellWindow;
 class SnapshotTabHelper;
 class TabContentsSSLHelper;
@@ -275,14 +275,6 @@ class TabContents : public content::WebContentsObserver {
     return print_view_manager_.get();
   }
 
-  RestoreTabHelper* restore_tab_helper() {
-    return restore_tab_helper_.get();
-  }
-
-  const RestoreTabHelper* restore_tab_helper() const {
-    return restore_tab_helper_.get();
-  }
-
   SadTabHelper* sad_tab_helper() { return sad_tab_helper_.get(); }
 
   SearchEngineTabHelper* search_engine_tab_helper() {
@@ -293,6 +285,14 @@ class TabContents : public content::WebContentsObserver {
     return search_tab_helper_.get();
   }
 
+  SessionTabHelper* session_tab_helper() {
+    return session_tab_helper_.get();
+  }
+
+  const SessionTabHelper* session_tab_helper() const {
+    return session_tab_helper_.get();
+  }
+
   SnapshotTabHelper* snapshot_tab_helper() {
     return snapshot_tab_helper_.get();
   }
@@ -328,7 +328,6 @@ class TabContents : public content::WebContentsObserver {
 
   // content::WebContentsObserver overrides:
   virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;
-  virtual void UserAgentOverrideSet(const std::string& user_agent) OVERRIDE;
 
  private:
   friend class TabContentsFactory;
@@ -377,10 +376,10 @@ class TabContents : public content::WebContentsObserver {
   // Handles print job for this contents.
   scoped_ptr<printing::PrintViewManager> print_view_manager_;
 
-  scoped_ptr<RestoreTabHelper> restore_tab_helper_;
   scoped_ptr<SadTabHelper> sad_tab_helper_;
   scoped_ptr<SearchEngineTabHelper> search_engine_tab_helper_;
   scoped_ptr<chrome::search::SearchTabHelper> search_tab_helper_;
+  scoped_ptr<SessionTabHelper> session_tab_helper_;
   scoped_ptr<SnapshotTabHelper> snapshot_tab_helper_;
   scoped_ptr<TabContentsSSLHelper> ssl_helper_;
   scoped_ptr<browser_sync::SyncedTabDelegate> synced_tab_delegate_;