summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/api/extension_action/page_action_apitest.cc')
-rw-r--r--chrome/browser/extensions/api/extension_action/page_action_apitest.cc14
1 files changed, 7 insertions, 7 deletions
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 a221047..d8c2b55 100644
--- a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/omnibox/location_bar.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_action.h"
#include "chrome/test/base/ui_test_utils.h"
@@ -33,7 +33,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {
}
// Test that we received the changes.
- int tab_id = browser()->GetSelectedTabContentsWrapper()->
+ int tab_id = browser()->GetActiveTabContents()->
restore_tab_helper()->session_id().id();
ExtensionAction* action = extension->page_action();
ASSERT_TRUE(action);
@@ -43,7 +43,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {
// Simulate the page action being clicked.
ResultCatcher catcher;
int tab_id =
- ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents());
+ ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents());
ExtensionService* service = browser()->profile()->GetExtensionService();
service->browser_event_router()->PageActionExecuted(
browser()->profile(), extension->id(), "", tab_id, "", 0);
@@ -59,7 +59,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {
}
// Test that we received the changes.
- tab_id = browser()->GetSelectedTabContentsWrapper()->restore_tab_helper()->
+ tab_id = browser()->GetActiveTabContents()->restore_tab_helper()->
session_id().id();
EXPECT_FALSE(action->GetIcon(tab_id).isNull());
}
@@ -71,7 +71,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageActionAddPopup) {
const Extension* extension = GetSingleLoadedExtension();
ASSERT_TRUE(extension) << message_;
- int tab_id = ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents());
+ int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents());
ExtensionAction* page_action = extension->page_action();
ASSERT_TRUE(page_action)
@@ -117,7 +117,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageActionRemovePopup) {
const Extension* extension = GetSingleLoadedExtension();
ASSERT_TRUE(extension) << message_;
- int tab_id = ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents());
+ int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents());
ExtensionAction* page_action = extension->page_action();
ASSERT_TRUE(page_action)
@@ -158,7 +158,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OldPageActions) {
{
ResultCatcher catcher;
int tab_id =
- ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents());
+ ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents());
ExtensionService* service = browser()->profile()->GetExtensionService();
service->browser_event_router()->PageActionExecuted(
browser()->profile(), extension->id(), "action", tab_id, "", 1);