RestoreTabHelper > SessionTabHelper, move more session stuff into it.

chrome/browser/ui/tab_contents/tab_contents.cc

Index: chrome/browser/ui/tab_contents/tab_contents.cc
diff --git a/chrome/browser/ui/tab_contents/tab_contents.cc b/chrome/browser/ui/tab_contents/tab_contents.cc
index 09b4965f8bbee159737173557ea9faacb48d7be0..94e28b8a7fb4fcc841889450dc370cfb69d5b1e8 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents.cc
@@ -27,9 +27,7 @@
 #include "chrome/browser/printing/print_preview_message_handler.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_tab_observer.h"
-#include "chrome/browser/sessions/restore_tab_helper.h"
-#include "chrome/browser/sessions/session_service.h"
-#include "chrome/browser/sessions/session_service_factory.h"
+#include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/tab_contents/navigation_metrics_recorder.h"
 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
@@ -106,9 +104,9 @@ TabContents::TabContents(WebContents* contents)
                         new TabContentsUserData(this));
 
   // Create the tab helpers.
-  // restore_tab_helper because it sets up the tab ID, and other helpers may
+  // session_tab_helper because it sets up the tab ID, and other helpers may
   // rely on that.
-  restore_tab_helper_.reset(new RestoreTabHelper(contents));
+  session_tab_helper_.reset(new SessionTabHelper(contents));
 
   autocomplete_history_manager_.reset(new AutocompleteHistoryManager(contents));
   autofill_manager_ = new AutofillManager(this);
@@ -269,15 +267,3 @@ void TabContents::WebContentsDestroyed(WebContents* tab) {
   // will attempt to access the WebContents and we'll crash.
   DCHECK(in_destructor_);
 }
-
-void TabContents::UserAgentOverrideSet(const std::string& user_agent) {
-#if defined(ENABLE_SESSION_SERVICE)
-  SessionService* session =
-      SessionServiceFactory::GetForProfile(profile());
-  if (session) {
-    session->SetTabUserAgentOverride(restore_tab_helper()->window_id(),
-                                     restore_tab_helper()->session_id(),
-                                     user_agent);
-  }
-#endif
-}