Remove TabStripModel wrapper use.

chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.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 "base/string_number_conversions.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"
 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/ui/gtk/view_id_util.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_zoom.h"
 #include "grit/theme_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 23 matching lines @@
 class LocationBarViewGtkZoomTest : public InProcessBrowserTest {
  public:
   LocationBarViewGtkZoomTest() {}
   virtual ~LocationBarViewGtkZoomTest() {}
 
  protected:
   void ExpectTooltipContainsZoom() {
     gchar* text = gtk_widget_get_tooltip_text(GetZoomWidget());
     std::string tooltip(text);
     g_free(text);
-    content::WebContents* contents = chrome::GetActiveWebContents(browser());
+    content::WebContents* contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
     std::string zoom_percent = base::IntToString(GetZoomPercent(contents));
     EXPECT_FALSE(tooltip.find(zoom_percent) == std::string::npos);
   }
 
   bool ZoomIconIsShowing() {
     return gtk_widget_get_visible(GetZoomWidget());
   }
 
   void ExpectIconIsResource(int resource_id) {
     // TODO(dbeam): actually compare the image bits with gfx::test::IsEqual?
-    content::WebContents* contents = chrome::GetActiveWebContents(browser());
+    content::WebContents* contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
     ZoomController* zoom_controller = ZoomController::FromWebContents(contents);
     EXPECT_EQ(resource_id, zoom_controller->GetResourceForZoomLevel());
   }
 
   void ResetZoom() {
     WaitForZoom(content::PAGE_ZOOM_RESET);
   }
 
   content::WebContents* SetUpTest() {
-    content::WebContents* contents = chrome::GetActiveWebContents(browser());
+    content::WebContents* contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
     ResetZoom();
     ExpectAtDefaultZoom(contents);
     return contents;
   }
 
   void ZoomIn() {
     WaitForZoom(content::PAGE_ZOOM_IN);
   }
 
   void ZoomOut() {
@@ skipping 72 matching lines @@
   DCHECK_LT(GetZoomPercent(contents), zoom_level);
   ExpectZoomedOut(contents);
   EXPECT_TRUE(ZoomIconIsShowing());
   ExpectIconIsResource(IDR_ZOOM_MINUS);
   ExpectTooltipContainsZoom();
 
   ResetZoom();
   ExpectAtDefaultZoom(contents);
   EXPECT_FALSE(ZoomIconIsShowing());
 }