chrome/browser/ui/browser_navigator_browsertest.cc - Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

Unified Diff: chrome/browser/ui/browser_navigator_browsertest.cc

Issue 9015022: Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 8 years, 12 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

Index: chrome/browser/ui/browser_navigator_browsertest.cc

===================================================================

--- chrome/browser/ui/browser_navigator_browsertest.cc (revision 116109)

+++ chrome/browser/ui/browser_navigator_browsertest.cc (working copy)

@@ -26,6 +26,8 @@

#include "content/public/browser/notification_service.h"

#include "content/public/browser/notification_types.h"

+using content::WebContents;

namespace {

GURL GetGoogleURL() {

@@ -91,7 +93,7 @@

}

void BrowserNavigatorTest::RunSuppressTest(WindowOpenDisposition disposition) {

- GURL old_url = browser()->GetSelectedTabContents()->GetURL();

+ GURL old_url = browser()->GetSelectedWebContents()->GetURL();

browser::NavigateParams p(MakeNavigateParams());

p.disposition = disposition;

browser::Navigate(&p);

@@ -99,7 +101,7 @@

// Nothing should have happened as a result of Navigate();

EXPECT_EQ(1, browser()->tab_count());

EXPECT_EQ(1u, BrowserList::size());

- EXPECT_EQ(old_url, browser()->GetSelectedTabContents()->GetURL());

+ EXPECT_EQ(old_url, browser()->GetSelectedWebContents()->GetURL());

}

void BrowserNavigatorTest::RunUseNonIncognitoWindowTest(const GURL& url) {

@@ -120,7 +122,7 @@

EXPECT_NE(incognito_browser, p.browser);

EXPECT_EQ(browser(), p.browser);

EXPECT_EQ(2, browser()->tab_count());

- EXPECT_EQ(url, browser()->GetSelectedTabContents()->GetURL());

+ EXPECT_EQ(url, browser()->GetSelectedWebContents()->GetURL());

}

void BrowserNavigatorTest::RunDoNothingIfIncognitoIsForcedTest(

@@ -146,7 +148,7 @@

EXPECT_EQ(browser, p.browser);

EXPECT_EQ(1, browser->tab_count());

EXPECT_EQ(GURL(chrome::kAboutBlankURL),

- browser->GetSelectedTabContents()->GetURL());

+ browser->GetSelectedWebContents()->GetURL());

}

void BrowserNavigatorTest::Observe(

@@ -170,7 +172,7 @@

// of the Browser remains the same and the current tab bears the loaded URL.

IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_CurrentTab) {

ui_test_utils::NavigateToURL(browser(), GetGoogleURL());

- EXPECT_EQ(GetGoogleURL(), browser()->GetSelectedTabContents()->GetURL());

+ EXPECT_EQ(GetGoogleURL(), browser()->GetSelectedWebContents()->GetURL());

// We should have one window with one tab.

EXPECT_EQ(1u, BrowserList::size());

EXPECT_EQ(1, browser()->tab_count());

@@ -291,11 +293,11 @@

// tab count of the Browser increases and the selected tab shifts to the new

// foreground tab.

IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewForegroundTab) {

- TabContents* old_contents = browser()->GetSelectedTabContents();

+ WebContents* old_contents = browser()->GetSelectedWebContents();

browser::NavigateParams p(MakeNavigateParams());

p.disposition = NEW_FOREGROUND_TAB;

browser::Navigate(&p);

- EXPECT_NE(old_contents, browser()->GetSelectedTabContents());

+ EXPECT_NE(old_contents, browser()->GetSelectedWebContents());

EXPECT_EQ(browser()->GetSelectedTabContentsWrapper(), p.target_contents);

EXPECT_EQ(2, browser()->tab_count());

}

@@ -303,11 +305,11 @@

// This test verifies that when a navigation results in a background tab, the

// tab count of the Browser increases but the selected tab remains the same.

IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewBackgroundTab) {

- TabContents* old_contents = browser()->GetSelectedTabContents();

+ WebContents* old_contents = browser()->GetSelectedWebContents();

browser::NavigateParams p(MakeNavigateParams());

p.disposition = NEW_BACKGROUND_TAB;

browser::Navigate(&p);

- TabContents* new_contents = browser()->GetSelectedTabContents();

+ WebContents* new_contents = browser()->GetSelectedWebContents();

// The selected tab should have remained unchanged, since the new tab was

// opened in the background.

EXPECT_EQ(old_contents, new_contents);

@@ -698,7 +700,7 @@

// the same result as navigating to a new foreground tab in the (only)

// active browser. Tests are the same as for Disposition_NewForegroundTab.

IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NullBrowser_NewForegroundTab) {

- TabContents* old_contents = browser()->GetSelectedTabContents();

+ WebContents* old_contents = browser()->GetSelectedWebContents();

// Navigate with a NULL browser.

browser::NavigateParams p(MakeNavigateParams(NULL));

p.disposition = NEW_FOREGROUND_TAB;

@@ -707,7 +709,7 @@

// Navigate() should have found browser() and create a new tab.

EXPECT_EQ(browser(), p.browser);

- EXPECT_NE(old_contents, browser()->GetSelectedTabContents());

+ EXPECT_NE(old_contents, browser()->GetSelectedWebContents());

EXPECT_EQ(browser()->GetSelectedTabContentsWrapper(), p.target_contents);

EXPECT_EQ(2, browser()->tab_count());

}

@@ -777,7 +779,7 @@

EXPECT_EQ(3, browser()->tab_count());

EXPECT_EQ(2, browser()->active_index());

EXPECT_EQ(GetSettingsAdvancedURL(),

- browser()->GetSelectedTabContents()->GetURL());

+ browser()->GetSelectedWebContents()->GetURL());

}

// This test verifies that constructing params with disposition = SINGLETON_TAB

@@ -810,7 +812,7 @@

EXPECT_EQ(3, browser()->tab_count());

EXPECT_EQ(1, browser()->active_index());

EXPECT_EQ(GetSettingsAdvancedURL(),

- browser()->GetSelectedTabContents()->GetURL());

+ browser()->GetSelectedWebContents()->GetURL());

}

// This test verifies that constructing params with disposition = SINGLETON_TAB

@@ -843,7 +845,7 @@

EXPECT_EQ(3, browser()->tab_count());

EXPECT_EQ(1, browser()->active_index());

EXPECT_EQ(GetSettingsPersonalURL(),

- browser()->GetSelectedTabContents()->GetURL());

+ browser()->GetSelectedWebContents()->GetURL());

}

// This test verifies that constructing params with disposition = SINGLETON_TAB

@@ -875,7 +877,7 @@

EXPECT_EQ(3, browser()->tab_count());

EXPECT_EQ(1, browser()->active_index());

EXPECT_EQ(singleton_url1,

- browser()->GetSelectedTabContents()->GetURL());

+ browser()->GetSelectedWebContents()->GetURL());

}

// This test verifies that constructing params with disposition = SINGLETON_TAB

@@ -906,7 +908,7 @@

EXPECT_EQ(2, browser()->tab_count());

EXPECT_EQ(1, browser()->active_index());

EXPECT_EQ(singleton_url_target,

- browser()->GetSelectedTabContents()->GetURL());

+ browser()->GetSelectedWebContents()->GetURL());

}

// This test verifies that constructing params with disposition = SINGLETON_TAB

@@ -963,7 +965,7 @@

EXPECT_EQ(1u, BrowserList::size());

EXPECT_EQ(GURL("chrome://settings"),

- browser()->GetSelectedTabContents()->GetURL().GetOrigin());

+ browser()->GetSelectedWebContents()->GetURL().GetOrigin());

}

// Settings page is expected to always open in normal mode regardless

@@ -1046,7 +1048,7 @@

}

EXPECT_EQ(1, browser()->tab_count());

EXPECT_EQ(GetSettingsURL(),

- browser()->GetSelectedTabContents()->GetURL().GetOrigin());

+ browser()->GetSelectedWebContents()->GetURL().GetOrigin());

}

IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,

@@ -1064,7 +1066,7 @@

}

EXPECT_EQ(1, browser()->tab_count());

EXPECT_EQ(GetSettingsURL(),

- browser()->GetSelectedTabContents()->GetURL().GetOrigin());

+ browser()->GetSelectedWebContents()->GetURL().GetOrigin());

}

IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,

@@ -1074,7 +1076,7 @@

ui_test_utils::NavigateToURL(&p);

EXPECT_EQ(1, browser()->tab_count());

EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),

- browser()->GetSelectedTabContents()->GetURL());

+ browser()->GetSelectedWebContents()->GetURL());

{

ui_test_utils::WindowedNotificationObserver observer(

@@ -1085,14 +1087,14 @@

}

EXPECT_EQ(1, browser()->tab_count());

EXPECT_EQ(GetSettingsURL(),

- browser()->GetSelectedTabContents()->GetURL().GetOrigin());

+ browser()->GetSelectedWebContents()->GetURL().GetOrigin());

}

IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,

NavigateFromPageToOptionsInNewTab) {

browser::NavigateParams p(MakeNavigateParams());

ui_test_utils::NavigateToURL(&p);

- EXPECT_EQ(GetGoogleURL(), browser()->GetSelectedTabContents()->GetURL());

+ EXPECT_EQ(GetGoogleURL(), browser()->GetSelectedWebContents()->GetURL());

EXPECT_EQ(1u, BrowserList::size());

EXPECT_EQ(1, browser()->tab_count());

@@ -1105,7 +1107,7 @@

}

EXPECT_EQ(2, browser()->tab_count());

EXPECT_EQ(GetSettingsURL(),

- browser()->GetSelectedTabContents()->GetURL().GetOrigin());

+ browser()->GetSelectedWebContents()->GetURL().GetOrigin());

}

IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,

@@ -1131,7 +1133,7 @@

}

EXPECT_EQ(2, browser()->tab_count());

EXPECT_EQ(GetSettingsURL(),

- browser()->GetSelectedTabContents()->GetURL().GetOrigin());

+ browser()->GetSelectedWebContents()->GetURL().GetOrigin());

}

IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,

@@ -1145,7 +1147,7 @@

}

EXPECT_EQ(1, browser()->tab_count());

EXPECT_EQ(GetSettingsPersonalURL(),

- browser()->GetSelectedTabContents()->GetURL());

+ browser()->GetSelectedWebContents()->GetURL());

browser()->NewTab();

EXPECT_EQ(2, browser()->tab_count());

@@ -1159,7 +1161,7 @@

}

EXPECT_EQ(2, browser()->tab_count());

EXPECT_EQ(GetSettingsPersonalURL(),

- browser()->GetSelectedTabContents()->GetURL());

+ browser()->GetSelectedWebContents()->GetURL());

}

IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,

@@ -1189,7 +1191,7 @@

}

EXPECT_EQ(2, browser()->tab_count());

EXPECT_EQ(GetSettingsURL(),

- browser()->GetSelectedTabContents()->GetURL().GetOrigin());

+ browser()->GetSelectedWebContents()->GetURL().GetOrigin());

}

// Tests that when a new tab is opened from the omnibox, the focus is moved from

@@ -1241,7 +1243,7 @@

}

EXPECT_EQ(1, browser()->tab_count());

EXPECT_EQ(GURL(chrome::kChromeUIHistoryURL),

- browser()->GetSelectedTabContents()->GetURL());

+ browser()->GetSelectedWebContents()->GetURL());

}

IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,

@@ -1255,7 +1257,7 @@

}

EXPECT_EQ(1, browser()->tab_count());

EXPECT_EQ(GURL(chrome::kChromeUIBookmarksURL),

- browser()->GetSelectedTabContents()->GetURL());

+ browser()->GetSelectedWebContents()->GetURL());

}

IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,

@@ -1269,7 +1271,7 @@

}

EXPECT_EQ(1, browser()->tab_count());

EXPECT_EQ(GURL(chrome::kChromeUIDownloadsURL),

- browser()->GetSelectedTabContents()->GetURL());

+ browser()->GetSelectedWebContents()->GetURL());

}

} // namespace

« no previous file with comments | « chrome/browser/ui/browser_init.cc ('k') | chrome/browser/ui/browser_navigator_browsertest_chromeos.cc » ('j') | no next file with comments »