summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 01:53:30 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-12 01:53:30 +0000
commitb62084b5b4cc4923e8007495a482839a94c3704f (patch)
tree0af405b028f7af0e751301d18cf7c8c674a8aa36 /chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
parent6be34a67b24aef48908eeaa99643a180359309dc (diff)
downloadchromium_src-b62084b5b4cc4923e8007495a482839a94c3704f.zip
chromium_src-b62084b5b4cc4923e8007495a482839a94c3704f.tar.gz
chromium_src-b62084b5b4cc4923e8007495a482839a94c3704f.tar.bz2
TabContentsWrapper -> TabContents, part 12.
Extensions. BUG=131026 TEST=no change Review URL: https://chromiumcodereview.appspot.com/10535077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/extension_action/browser_action_apitest.cc')
-rw-r--r--chrome/browser/extensions/api/extension_action/browser_action_apitest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
index 3eb8730..032b41f 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
@@ -80,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) {
service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);
// Verify the command worked.
- WebContents* tab = browser()->GetSelectedWebContents();
+ WebContents* tab = browser()->GetActiveWebContents();
bool result = false;
ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
tab->GetRenderViewHost(), L"",
@@ -196,7 +196,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionAddPopup) {
const Extension* extension = GetSingleLoadedExtension();
ASSERT_TRUE(extension) << message_;
- int tab_id = ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents());
+ int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents());
ExtensionAction* browser_action = extension->browser_action();
ASSERT_TRUE(browser_action)
@@ -251,7 +251,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionRemovePopup) {
const Extension* extension = GetSingleLoadedExtension();
ASSERT_TRUE(extension) << message_;
- int tab_id = ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents());
+ int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents());
ExtensionAction* browser_action = extension->browser_action();
ASSERT_TRUE(browser_action)