Remove TabStripModel wrapper use.

chrome/browser/extensions/api/extension_action/page_action_apitest.cc

Index: chrome/browser/extensions/api/extension_action/page_action_apitest.cc
diff --git a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
index ff8d54f7aa7114e9fd7837f4d6e4888e02f53b90..7c5a9ddda942b45d2b5a86c94f5824e14c82a450 100644
--- a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
@@ -13,9 +13,9 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
@@ -46,7 +46,7 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, Basic) {
 
   // Test that we received the changes.
   int tab_id = SessionTabHelper::FromWebContents(
-      chrome::GetActiveWebContents(browser()))->session_id().id();
+      browser()->tab_strip_model()->GetActiveWebContents())->session_id().id();
   ExtensionAction* action = GetPageAction(*extension);
   ASSERT_TRUE(action);
   EXPECT_EQ("Modified", action->GetTitle(tab_id));
@@ -54,8 +54,8 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, Basic) {
   {
     // Simulate the page action being clicked.
     ResultCatcher catcher;
-    int tab_id =
-        ExtensionTabUtil::GetTabId(chrome::GetActiveWebContents(browser()));
+    int tab_id = ExtensionTabUtil::GetTabId(
+        browser()->tab_strip_model()->GetActiveWebContents());
     ExtensionService* service = extensions::ExtensionSystem::Get(
         browser()->profile())->extension_service();
     service->browser_event_router()->PageActionExecuted(
@@ -77,7 +77,7 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, Basic) {
 
   // Test that we received the changes.
   tab_id = SessionTabHelper::FromWebContents(
-      chrome::GetActiveWebContents(browser()))->session_id().id();
+      browser()->tab_strip_model()->GetActiveWebContents())->session_id().id();
   EXPECT_FALSE(icon_factory.GetIcon(tab_id).IsEmpty());
 }
 
@@ -89,7 +89,7 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, AddPopup) {
   ASSERT_TRUE(extension) << message_;
 
   int tab_id = ExtensionTabUtil::GetTabId(
-      chrome::GetActiveWebContents(browser()));
+      browser()->tab_strip_model()->GetActiveWebContents());
 
   ExtensionAction* page_action = GetPageAction(*extension);
   ASSERT_TRUE(page_action)
@@ -137,7 +137,7 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, RemovePopup) {
   ASSERT_TRUE(extension) << message_;
 
   int tab_id = ExtensionTabUtil::GetTabId(
-      chrome::GetActiveWebContents(browser()));
+      browser()->tab_strip_model()->GetActiveWebContents());
 
   ExtensionAction* page_action = GetPageAction(*extension);
   ASSERT_TRUE(page_action)
@@ -178,8 +178,8 @@ IN_PROC_BROWSER_TEST_F(PageActionApiTest, OldPageActions) {
   // Simulate the page action being clicked.
   {
     ResultCatcher catcher;
-    int tab_id =
-        ExtensionTabUtil::GetTabId(chrome::GetActiveWebContents(browser()));
+    int tab_id = ExtensionTabUtil::GetTabId(
+        browser()->tab_strip_model()->GetActiveWebContents());
     ExtensionService* service = extensions::ExtensionSystem::Get(
         browser()->profile())->extension_service();
     ExtensionAction* page_action = GetPageAction(*extension);