chrome/browser/extensions/extension_override_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/extension_override_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:

Index: chrome/browser/extensions/extension_override_apitest.cc

diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc

index b71c856c3aa1c1fe9c56cb3d12e62d89bcd66e57..722d894078f6fae2a6522b7441fb13468a75d055 100644

--- a/chrome/browser/extensions/extension_override_apitest.cc

+++ b/chrome/browser/extensions/extension_override_apitest.cc

@@ -52,7 +52,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtab) {

// 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 = browser()->GetSelectedWebContents();

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

ASSERT_TRUE(tab->GetController().GetActiveEntry());

EXPECT_TRUE(tab->GetController().GetActiveEntry()->GetURL().

SchemeIs(chrome::kExtensionScheme));

@@ -79,7 +79,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideNewtabIncognito) {

GURL("chrome://newtab/"));

Browser* otr_browser = browser::FindTabbedBrowser(

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

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

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

ASSERT_TRUE(tab->GetController().GetActiveEntry());

EXPECT_FALSE(tab->GetController().GetActiveEntry()->GetURL().

SchemeIs(chrome::kExtensionScheme));