Remove tabstrip wrappers in browser_tabstrip.

chrome/browser/automation/testing_automation_provider.cc

 // Copyright 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/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 437 matching lines @@
   new BrowserClosedNotificationObserver(browser, this, reply_message, false);
   browser->window()->Close();
 }
 
 void TestingAutomationProvider::ActivateTab(int handle,
                                             int at_index,
                                             int* status) {
   *status = -1;
   if (browser_tracker_->ContainsHandle(handle) && at_index > -1) {
     Browser* browser = browser_tracker_->GetResource(handle);
-    if (at_index >= 0 && at_index < browser->tab_count()) {
-      chrome::ActivateTabAt(browser, at_index, true);
+    if (at_index >= 0 && at_index < browser->tab_strip_model()->count()) {
+      browser->tab_strip_model()->ActivateTabAt(at_index, true);
       *status = 0;
     }
   }
 }
 
 void TestingAutomationProvider::AppendTab(int handle,
                                           const GURL& url,
                                           IPC::Message* reply_message) {
   int append_tab_response = -1;  // -1 is the error code
   TabAppendedNotificationObserver* observer = NULL;
@@ skipping 5888 matching lines @@
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   TabStripModel* tab_strip = browser->tab_strip_model();
   if (tab_strip->GetActiveWebContents() != tab)
     tab_strip->ActivateTabAt(tab_strip->GetIndexOfWebContents(tab), true);
 }