Remove tabstrip wrappers in browser_tabstrip.

chrome/browser/ui/cocoa/applescript/window_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/window_applescript.h"
 
 #include "base/logging.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
@@ skipping 99 matching lines @@
   int activeTabIndex = browser_->active_index() + 1;
   if (!activeTabIndex) {
     return nil;
   }
   return [NSNumber numberWithInt:activeTabIndex];
 }
 
 - (void)setActiveTabIndex:(NSNumber*)anActiveTabIndex {
   // Note: applescript is 1-based, that is lists begin with index 1.
   int atIndex = [anActiveTabIndex intValue] - 1;
-  if (atIndex >= 0 && atIndex < browser_->tab_count())
-    chrome::ActivateTabAt(browser_, atIndex, true);
+  if (atIndex >= 0 && atIndex < browser_->tab_strip_model()->count())
+    browser_->tab_strip_model()->ActivateTabAt(atIndex, true);
   else
     AppleScript::SetError(AppleScript::errInvalidTabIndex);
 }
 
 - (NSString*)mode {
   Profile* profile = browser_->profile();
   if (profile->IsOffTheRecord())
     return AppleScript::kIncognitoWindowMode;
   return AppleScript::kNormalWindowMode;
 }
 
 - (void)setMode:(NSString*)theMode {
   // cannot set mode after window is created.
   if (theMode) {
     AppleScript::SetError(AppleScript::errSetMode);
   }
 }
 
 - (TabAppleScript*)activeTab {
   TabAppleScript* currentTab =
-      [[[TabAppleScript alloc]
-          initWithWebContents:chrome::GetActiveWebContents(browser_)]
-              autorelease];
+      [[[TabAppleScript alloc] initWithWebContents:
+          browser_->tab_strip_model()->GetActiveWebContents()] autorelease];
   [currentTab setContainer:self
                   property:AppleScript::kTabsProperty];
   return currentTab;
 }
 
 - (NSArray*)tabs {
   NSMutableArray* tabs = [NSMutableArray
       arrayWithCapacity:browser_->tab_count()];
 
   for (int i = 0; i < browser_->tab_count(); ++i) {
     // Check to see if tab is closing.
-    content::WebContents* webContents = chrome::GetWebContentsAt(browser_, i);
+    content::WebContents* webContents =
+        browser_->tab_strip_model()->GetWebContentsAt(i);
     if (webContents->IsBeingDestroyed()) {
       continue;
     }
 
     scoped_nsobject<TabAppleScript> tab(
         [[TabAppleScript alloc] initWithWebContents:webContents]);
     [tab setContainer:self
              property:AppleScript::kTabsProperty];
     [tabs addObject:tab];
   }
@@ skipping 29 matching lines @@
   params.disposition = NEW_FOREGROUND_TAB;
   params.tabstrip_index = index;
   chrome::Navigate(&params);
   params.target_contents->web_contents()->SetNewTabStartTime(
       newTabStartTime);
 
   [aTab setWebContents:params.target_contents->web_contents()];
 }
 
 - (void)removeFromTabsAtIndex:(int)index {
-  chrome::CloseWebContents(browser_, chrome::GetWebContentsAt(browser_, index));
+  chrome::CloseWebContents(
+      browser_, browser_->tab_strip_model()->GetWebContentsAt(index));
 }
 
 - (NSNumber*)orderedIndex {
   return [NSNumber numberWithInt:[[self nativeHandle] orderedIndex]];
 }
 
 - (void)setOrderedIndex:(NSNumber*)anIndex {
   int index = [anIndex intValue] - 1;
   if (index < 0 || index >= (int)BrowserList::size()) {
     AppleScript::SetError(AppleScript::errWrongIndex);
@@ skipping 42 matching lines @@
         GURL(), FEB_TYPE_FULLSCREEN_EXIT_INSTRUCTION);
   }
 }
 
 - (void)handlesExitPresentationMode:(NSScriptCommand*)command {
   if (browser_->window())
     browser_->window()->ExitPresentationMode();
 }
 
 @end