chrome/browser/ui/omnibox/omnibox_view_browsertest.cc - Issue 10551002: TabContentsWrapper -> TabContents, part 56.

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/ui/omnibox/omnibox_view_browsertest.cc

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

Patch Set: Not killing GetSelectedWebContents yet 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/ui/omnibox/omnibox_view_browsertest.cc

diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

index b246942788397ef7a2ce2b04aaa02784c753e698..154901340f502226965567f1596ed1081ead4216 100644

--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

@@ -583,9 +583,9 @@ class OmniboxViewTest : public InProcessBrowserTest,

ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, ui::EF_CONTROL_DOWN,

content::NOTIFICATION_NAV_ENTRY_COMMITTED,

content::Source<content::NavigationController>(

- &browser()->GetSelectedWebContents()->GetController())));

+ &browser()->GetActiveWebContents()->GetController())));

- GURL url = browser()->GetSelectedWebContents()->GetURL();

+ GURL url = browser()->GetActiveWebContents()->GetURL();

EXPECT_STREQ(kDesiredTLDHostname, url.host().c_str());

}

@@ -619,8 +619,8 @@ class OmniboxViewTest : public InProcessBrowserTest,

ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, 0,

content::NOTIFICATION_NAV_ENTRY_COMMITTED,

content::Source<content::NavigationController>(

- &browser()->GetSelectedWebContents()->GetController())));

- GURL url = browser()->GetSelectedWebContents()->GetURL();

+ &browser()->GetActiveWebContents()->GetController())));

+ GURL url = browser()->GetActiveWebContents()->GetURL();

EXPECT_STREQ(kSearchTextURL, url.spec().c_str());

// Test that entering a single character then Enter performs a search.

@@ -639,8 +639,8 @@ class OmniboxViewTest : public InProcessBrowserTest,

ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, 0,

content::NOTIFICATION_NAV_ENTRY_COMMITTED,

content::Source<content::NavigationController>(

- &browser()->GetSelectedWebContents()->GetController())));

- url = browser()->GetSelectedWebContents()->GetURL();

+ &browser()->GetActiveWebContents()->GetController())));

+ url = browser()->GetActiveWebContents()->GetURL();

EXPECT_STREQ(kSearchSingleCharURL, url.spec().c_str());

}