RestoreTabHelper > SessionTabHelper, move more session stuff into it.

chrome/browser/automation/automation_provider_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/automation/automation_provider.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/json/json_reader.h"
 #include "base/run_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_browser_tracker.h"
 #include "chrome/browser/automation/automation_tab_tracker.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
 #include "chrome/browser/external_tab/external_tab_container.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/profiles/profile.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_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_zoom.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 176 matching lines @@
       settings.handle_top_level_requests, NULL, settings.initial_url,
       settings.referrer, settings.infobars_enabled,
       settings.route_all_top_level_navigations);
 
   if (AddExternalTab(external_tab_container)) {
     WebContents* web_contents = external_tab_container->GetWebContents();
     *tab_handle = external_tab_container->GetTabHandle();
     *tab_container_window = external_tab_container->GetExternalTabNativeView();
     *tab_window = web_contents->GetNativeView();
     *session_id = external_tab_container->GetTabContents()->
-        restore_tab_helper()->session_id().id();
+        session_tab_helper()->session_id().id();
   } else {
     external_tab_container->Uninitialize();
   }
 
   TRACE_EVENT_END_ETW("AutomationProvider::CreateExternalTab", 0, "");
 }
 
 bool AutomationProvider::AddExternalTab(ExternalTabContainer* external_tab) {
   DCHECK(external_tab != NULL);
 
@@ skipping 118 matching lines @@
 
   if (allow && AddExternalTab(external_tab_container)) {
     external_tab_container->Reinitialize(this,
                                          automation_resource_message_filter_,
                                          parent_window);
     WebContents* tab_contents = external_tab_container->GetWebContents();
     *tab_handle = external_tab_container->GetTabHandle();
     *tab_container_window = external_tab_container->GetExternalTabNativeView();
     *tab_window = tab_contents->GetNativeView();
     *session_id = external_tab_container->GetTabContents()->
-        restore_tab_helper()->session_id().id();
+        session_tab_helper()->session_id().id();
   } else {
     external_tab_container->Uninitialize();
   }
 
   TRACE_EVENT_END_ETW("AutomationProvider::ConnectExternalTab", 0, "");
 }
 
 void AutomationProvider::OnBrowserMoved(int tab_handle) {
   ExternalTabContainer* external_tab = GetExternalTabForHandle(tab_handle);
   if (!external_tab) {
@@ skipping 52 matching lines @@
 void AutomationProvider::OnSetZoomLevel(int handle, int zoom_level) {
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* tab = tab_tracker_->GetResource(handle);
     if (tab->GetWebContents() && tab->GetWebContents()->GetRenderViewHost()) {
       RenderViewHost* host = tab->GetWebContents()->GetRenderViewHost();
       content::PageZoom zoom = static_cast<content::PageZoom>(zoom_level);
       host->Zoom(zoom);
     }
   }
 }