RestoreTabHelper > SessionTabHelper, move more session stuff into it.

chrome/browser/ui/cocoa/applescript/tab_applescript.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/applescript/tab_applescript.h"
 
 #import <Carbon/Carbon.h>
 #import <Foundation/NSAppleEventDescriptor.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/printing/print_view_manager.h"
-#include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/sessions/session_id.h"
+#include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/cocoa/applescript/error_applescript.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/save_page_type.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "googleurl/src/gurl.h"
@@ skipping 132 matching lines @@
     return nil;
   }
 
   if ((self = [super init])) {
     // It is safe to be weak, if a tab goes away (eg user closing a tab)
     // the applescript runtime calls tabs in AppleScriptWindow and this
     // particular tab is never returned.
     tabContents_ = aTabContent;
     scoped_nsobject<NSNumber> numID(
         [[NSNumber alloc]
-            initWithInt:tabContents_->restore_tab_helper()->session_id().id()]);
+            initWithInt:tabContents_->session_tab_helper()->session_id().id()]);
     [self setUniqueID:numID];
   }
   return self;
 }
 
 - (void)setTabContent:(TabContents*)aTabContent {
   DCHECK(aTabContent);
   // It is safe to be weak, if a tab goes away (eg user closing a tab)
   // the applescript runtime calls tabs in AppleScriptWindow and this
   // particular tab is never returned.
   tabContents_ = aTabContent;
   scoped_nsobject<NSNumber> numID(
       [[NSNumber alloc]
-          initWithInt:tabContents_->restore_tab_helper()->session_id().id()]);
+          initWithInt:tabContents_->session_tab_helper()->session_id().id()]);
   [self setUniqueID:numID];
 
   if ([self tempURL])
     [self setURL:[self tempURL]];
 }
 
 - (NSString*)URL {
   if (!tabContents_) {
     return nil;
   }
@@ skipping 213 matching lines @@
   }
 
   string16 script = base::SysNSStringToUTF16(
       [[command evaluatedArguments] objectForKey:@"javascript"]);
   Value* value = view->ExecuteJavascriptAndGetValue(string16(), script);
   NSAppleEventDescriptor* descriptor = valueToDescriptor(value);
   return [[[AnyResultValue alloc] initWithDescriptor:descriptor] autorelease];
 }
 
 @end