summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-13 15:46:40 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-13 15:46:40 +0000
commitfb0728cf1761403db3e2ded2c4cc9426b981b09b (patch)
tree2a540280f7fb5ae5a54fee827e1899b1b59a3985 /chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
parent237c404691c13d4932e8b29198c6183b51479c09 (diff)
downloadchromium_src-fb0728cf1761403db3e2ded2c4cc9426b981b09b.zip
chromium_src-fb0728cf1761403db3e2ded2c4cc9426b981b09b.tar.gz
chromium_src-fb0728cf1761403db3e2ded2c4cc9426b981b09b.tar.bz2
TabContentsWrapper -> TabContents, part 56.
That's almost all. BUG=131026 TEST=no change Review URL: https://chromiumcodereview.appspot.com/10551002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/omnibox/omnibox_view_browsertest.cc')
-rw-r--r--chrome/browser/ui/omnibox/omnibox_view_browsertest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index b246942..1549013 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());
}