Remove tabstrip wrappers in browser_tabstrip.

chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.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 <gtk/gtk.h>
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 24 matching lines @@
 
   // Create new tab; open findbar.
   chrome::NewTab(browser());
   chrome::Find(browser());
 
   // Create new tab with an arbitrary URL.
   GURL url = test_server()->GetURL(kSimplePage);
   chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED);
 
   // Switch back to the NTP with the active findbar.
-  chrome::ActivateTabAt(browser(), 1, false);
+  browser()->tab_strip_model()->ActivateTabAt(1, false);
 
   // Wait for the findbar to show.
   MessageLoop::current()->RunUntilIdle();
 
   // Set focus somewhere else, so that we can test clicking on the findbar
   // works.
   chrome::FocusLocationBar(browser());
   ui_test_utils::ClickOnView(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD);
   ui_test_utils::IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD);
 }
@@ skipping 18 matching lines @@
   MessageLoop::current()->RunUntilIdle();
 
   // This is kind of a hack. Calling this just once doesn't seem to send a click
   // event, but doing it twice works.
   // http://crbug.com/35581
   ui_test_utils::ClickOnView(browser(), VIEW_ID_OTHER_BOOKMARKS);
   ui_test_utils::ClickOnView(browser(), VIEW_ID_OTHER_BOOKMARKS);
 
   EXPECT_TRUE(has_been_clicked);
 }