Remove TabStripModel wrapper use.

chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc

Index: chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc b/chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc
index 19226fec87b0b3285a39a1ff3e67ca10ba077e8d..770f56eb12b948ae09746d83aa8d5ec6920ebd77 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc
@@ -7,12 +7,12 @@
 #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"
@@ -56,7 +56,8 @@ class LocationBarViewGtkZoomTest : public InProcessBrowserTest {
     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);
   }
@@ -67,7 +68,8 @@ class LocationBarViewGtkZoomTest : public InProcessBrowserTest {
 
   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());
   }
@@ -77,7 +79,8 @@ class LocationBarViewGtkZoomTest : public InProcessBrowserTest {
   }
 
   content::WebContents* SetUpTest() {
-    content::WebContents* contents = chrome::GetActiveWebContents(browser());
+    content::WebContents* contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
     ResetZoom();
     ExpectAtDefaultZoom(contents);
     return contents;