Remove TabStripModel wrapper use.

chrome/browser/extensions/extension_override_apitest.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 "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/constants.h"
 
 using content::WebContents;
 
 class ExtensionOverrideTest : public ExtensionApiTest {
@@ skipping 24 matching lines @@
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtab) {
   ASSERT_TRUE(RunExtensionTest("override/newtab")) << message_;
   {
     ResultCatcher catcher;
     // Navigate to the new tab page.  The overridden new tab page
     // will call chrome.test.notifyPass() .
     ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab/"));
-    WebContents* tab = chrome::GetActiveWebContents(browser());
+    WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
     ASSERT_TRUE(tab->GetController().GetActiveEntry());
     EXPECT_TRUE(tab->GetController().GetActiveEntry()->GetURL().
                 SchemeIs(extensions::kExtensionScheme));
 
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   // TODO(erikkay) Load a second extension with the same override.
   // Verify behavior, then unload the first and verify behavior, etc.
 }
 
 #if defined(OS_MACOSX)
 // Hangy: http://crbug.com/70511
 #define MAYBE_OverrideNewtabIncognito DISABLED_OverrideNewtabIncognito
 #else
 #define MAYBE_OverrideNewtabIncognito OverrideNewtabIncognito
 #endif
 IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideNewtabIncognito) {
   ASSERT_TRUE(RunExtensionTest("override/newtab")) << message_;
 
   // Navigate an incognito tab to the new tab page.  We should get the actual
   // new tab page because we can't load chrome-extension URLs in incognito.
   Browser* otr_browser = ui_test_utils::OpenURLOffTheRecord(
       browser()->profile(), GURL("chrome://newtab/"));
-  WebContents* tab = chrome::GetActiveWebContents(otr_browser);
+  WebContents* tab = otr_browser->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(tab->GetController().GetActiveEntry());
   EXPECT_FALSE(tab->GetController().GetActiveEntry()->GetURL().
                SchemeIs(extensions::kExtensionScheme));
 }
 
 // Times out consistently on Win, http://crbug.com/45173.
 #if defined(OS_WIN)
 #define MAYBE_OverrideHistory DISABLED_OverrideHistory
 #else
 #define MAYBE_OverrideHistory OverrideHistory
@@ skipping 41 matching lines @@
                                 ExtensionWebUI::kExtensionURLOverrides);
     update.Get()->Set("history", list);
   }
 
   ASSERT_FALSE(CheckHistoryOverridesContainsNoDupes());
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("override/history")));
 
   ASSERT_TRUE(CheckHistoryOverridesContainsNoDupes());
 }