chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc - Issue 10535077: TabContentsWrapper -> TabContents, part 12.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

Issue 10535077: TabContentsWrapper -> TabContents, part 12. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/web_navigation/web_navigation_api.cc ('k') | chrome/browser/extensions/api/web_request/web_request_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

index fef3a5bb2af0d88db7cf023ec7c390b6074b356f..1ebf8bb6755a318eb39f13b75f618b10ae1c9f92 100644

--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

@@ -183,7 +183,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationUserAction) {

ASSERT_TRUE(

RunExtensionSubtest("webnavigation", "test_userAction.html")) << message_;

- WebContents* tab = browser()->GetSelectedWebContents();

+ WebContents* tab = browser()->GetActiveWebContents();

ui_test_utils::WaitForLoadStop(tab);

ResultCatcher catcher;

@@ -221,7 +221,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationRequestOpenTab) {

ASSERT_TRUE(RunExtensionSubtest("webnavigation", "test_requestOpenTab.html"))

<< message_;

- WebContents* tab = browser()->GetSelectedWebContents();

+ WebContents* tab = browser()->GetActiveWebContents();

ui_test_utils::WaitForLoadStop(tab);

ResultCatcher catcher;

@@ -258,7 +258,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationTargetBlank) {

ASSERT_TRUE(RunExtensionSubtest("webnavigation", "test_targetBlank.html"))

<< message_;

- WebContents* tab = browser()->GetSelectedWebContents();

+ WebContents* tab = browser()->GetActiveWebContents();

ui_test_utils::WaitForLoadStop(tab);

ResultCatcher catcher;

@@ -304,7 +304,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationTargetBlankIncognito) {

ui_test_utils::OpenURLOffTheRecord(browser()->profile(), url);

WebContents* tab = browser::FindTabbedBrowser(

browser()->profile()->GetOffTheRecordProfile(), false)->

- GetSelectedWebContents();

+ GetActiveWebContents();

// There's a link with target=_blank on a.html. Click on it to open it in a

// new tab.