RestoreTabHelper > SessionTabHelper, move more session stuff into it.

chrome/browser/debugger/devtools_window.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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.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/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 389 matching lines @@
 
 void DevToolsWindow::UpdateFrontendAttachedState() {
   base::FundamentalValue docked(docked_);
   CallClientFunction("InspectorFrontendAPI.setAttachedWindow", &docked);
 }
 
 
 void DevToolsWindow::AddDevToolsExtensionsToClient() {
   if (inspected_tab_) {
     base::FundamentalValue tabId(
-        inspected_tab_->restore_tab_helper()->session_id().id());
+        inspected_tab_->session_tab_helper()->session_id().id());
     CallClientFunction("WebInspector.setInspectedTabId", &tabId);
   }
   ListValue results;
   const ExtensionService* extension_service =
       tab_contents_->profile()->GetOriginalProfile()->GetExtensionService();
   if (!extension_service)
     return;
 
   const ExtensionSet* extensions = extension_service->extensions();
 
@@ skipping 323 matching lines @@
   FileSelectHelper::RunFileChooser(web_contents, params);
 }
 
 void DevToolsWindow::UpdateBrowserToolbar() {
   if (!inspected_tab_)
     return;
   BrowserWindow* inspected_window = GetInspectedBrowserWindow();
   if (inspected_window)
     inspected_window->UpdateToolbar(inspected_tab_, false);
 }