Index: chrome/browser/extensions/plugin_apitest.cc |
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc |
index 28d7f60d6de79077adc05549a9822cc151b56f84..a125de3ff9fe48cafa3ed495364713d67c19becf 100644 |
--- a/chrome/browser/extensions/plugin_apitest.cc |
+++ b/chrome/browser/extensions/plugin_apitest.cc |
@@ -9,7 +9,7 @@ |
#include "chrome/browser/prefs/pref_service.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/tabs/tab_strip_model.h" |
#include "chrome/common/extensions/extension.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/test/base/ui_test_utils.h" |
@@ -43,7 +43,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { |
ui_test_utils::NavigateToURL(browser(), |
net::FilePathToFileURL(extension_dir.AppendASCII("test.html"))); |
- WebContents* tab = chrome::GetActiveWebContents(browser()); |
+ WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); |
// With no extensions, the plugin should not be loaded. |
bool result = false; |
@@ -86,7 +86,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { |
content::WindowedNotificationObserver observer( |
content::NOTIFICATION_LOAD_STOP, |
content::Source<NavigationController>( |
- &chrome::GetActiveWebContents(browser())->GetController())); |
+ &browser()->tab_strip_model()->GetActiveWebContents()-> |
+ GetController())); |
chrome::Reload(browser(), CURRENT_TAB); |
observer.Wait(); |
} |
@@ -122,7 +123,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) { |
// Load the test page through the extension URL, and the plugin should work. |
ui_test_utils::NavigateToURL(browser(), |
extension->GetResourceURL("test.html")); |
- WebContents* tab = chrome::GetActiveWebContents(browser()); |
+ WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); |
bool result = false; |
ASSERT_TRUE(content::ExecuteScriptAndExtractBool( |
tab, "testPluginWorks()", &result)); |