Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/browser_browsertest.cc

Issue 2819086: Removal of TabContentsDelegate::GetBrowser() interface method (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 4 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/browser.cc ('k') | chrome/browser/browser_focus_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_browsertest.cc
===================================================================
--- chrome/browser/browser_browsertest.cc (revision 55729)
+++ chrome/browser/browser_browsertest.cc (working copy)
@@ -204,8 +204,11 @@
GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
FilePath(kTitle1File)));
ui_test_utils::NavigateToURL(browser(), url);
+ Browser* browser_used = NULL;
browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, 0,
- TabStripModel::ADD_SELECTED, NULL, std::string());
+ TabStripModel::ADD_SELECTED, NULL, std::string(),
+ &browser_used);
+ EXPECT_EQ(browser(), browser_used);
EXPECT_EQ(2, browser()->tab_count());
EXPECT_EQ(0, browser()->selected_index());
TabContents* second_tab = browser()->GetTabContentsAt(1);
@@ -230,8 +233,11 @@
// There is one initial tab.
for (int ix = 0; ix != 33; ++ix) {
+ Browser* browser_used = NULL;
browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, 0,
- TabStripModel::ADD_SELECTED, NULL, std::string());
+ TabStripModel::ADD_SELECTED, NULL, std::string(),
+ &browser_used);
+ EXPECT_EQ(browser(), browser_used);
}
EXPECT_EQ(34, browser()->tab_count());
@@ -698,7 +704,8 @@
ASSERT_EQ(NULL, Browser::FindAppTab(browser(), extension_app_));
// Open a tab with the app.
- TabContents* tab = Browser::OpenApplicationTab(profile_, extension_app_);
+ TabContents* tab = Browser::OpenApplicationTab(profile_, extension_app_,
+ NULL);
ASSERT_TRUE(WaitForTab(tab));
ASSERT_EQ(2, browser()->tab_count());
@@ -755,7 +762,7 @@
// Open the app in a panel.
Browser::OpenApplicationWindow(profile_, extension_app_,
- Extension::LAUNCH_PANEL, GURL());
+ Extension::LAUNCH_PANEL, GURL(), NULL);
Browser* app_panel = BrowserList::GetLastActive();
ASSERT_TRUE(app_panel);
ASSERT_NE(app_panel, browser()) << "New browser should have opened.";
@@ -788,7 +795,7 @@
// Open a window with the app.
Browser::OpenApplicationWindow(profile_, extension_app_,
- Extension::LAUNCH_WINDOW, GURL());
+ Extension::LAUNCH_WINDOW, GURL(), NULL);
Browser* app_window = BrowserList::GetLastActive();
ASSERT_TRUE(app_window);
ASSERT_NE(app_window, browser()) << "New browser should have opened.";
@@ -816,7 +823,7 @@
ASSERT_EQ(1, browser()->tab_count());
// Open a tab with the app.
- Browser::OpenApplicationTab(profile_, extension_app_);
+ Browser::OpenApplicationTab(profile_, extension_app_, NULL);
ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
ASSERT_EQ(2, browser()->tab_count());
int app_tab_index = browser()->selected_index();
@@ -824,7 +831,7 @@
// Open a window with the app.
Browser::OpenApplicationWindow(profile_, extension_app_,
- Extension::LAUNCH_WINDOW, GURL());
+ Extension::LAUNCH_WINDOW, GURL(), NULL);
Browser* app_window = BrowserList::GetLastActive();
ASSERT_TRUE(app_window);
ASSERT_NE(app_window, browser()) << "New browser should have opened.";
@@ -845,7 +852,8 @@
ASSERT_EQ(1, browser()->tab_count());
// Open a tab with the app.
- TabContents* tab = Browser::OpenApplicationTab(profile_, extension_app_);
+ TabContents* tab = Browser::OpenApplicationTab(profile_, extension_app_,
+ NULL);
ASSERT_TRUE(WaitForTab(tab));
ASSERT_EQ(2, browser()->tab_count());
int app_tab_index = browser()->selected_index();
@@ -853,7 +861,7 @@
// Open a panel with the app.
Browser::OpenApplicationWindow(profile_, extension_app_,
- Extension::LAUNCH_PANEL, GURL());
+ Extension::LAUNCH_PANEL, GURL(), NULL);
Browser* app_panel = BrowserList::GetLastActive();
ASSERT_TRUE(app_panel);
ASSERT_NE(app_panel, browser()) << "New browser should have opened.";
@@ -873,7 +881,7 @@
ASSERT_EQ(1, browser()->tab_count());
- Browser::OpenApplicationTab(profile_, extension_app_);
+ Browser::OpenApplicationTab(profile_, extension_app_, NULL);
ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
ASSERT_EQ(2, browser()->tab_count());
int app_tab_index = browser()->selected_index();
@@ -883,7 +891,7 @@
Browser* extra_browser = CreateBrowser(profile_);
ASSERT_EQ(extra_browser, BrowserList::GetLastActive());
- Browser::OpenApplicationTab(profile_, extension_app_);
+ Browser::OpenApplicationTab(profile_, extension_app_, NULL);
ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(extra_browser));
ASSERT_EQ(2, extra_browser->tab_count());
app_tab_index = extra_browser->selected_index();
@@ -931,9 +939,11 @@
EXPECT_EQ(1, popup_browser->tab_count());
// Now try opening another tab in the popup browser.
+ Browser* browser_used = NULL;
popup_browser->AddTabWithURL(
GURL(chrome::kAboutBlankURL), GURL(), PageTransition::TYPED, -1,
- TabStripModel::ADD_SELECTED, NULL, std::string());
+ TabStripModel::ADD_SELECTED, NULL, std::string(), &browser_used);
+ EXPECT_EQ(popup_browser, browser_used);
// The popup should still only have one tab.
EXPECT_EQ(1, popup_browser->tab_count());
@@ -950,7 +960,8 @@
// Now try opening another tab in the app browser.
app_browser->AddTabWithURL(
GURL(chrome::kAboutBlankURL), GURL(), PageTransition::TYPED, -1,
- TabStripModel::ADD_SELECTED, NULL, std::string());
+ TabStripModel::ADD_SELECTED, NULL, std::string(), &browser_used);
+ EXPECT_EQ(app_browser, browser_used);
// The popup should still only have one tab.
EXPECT_EQ(1, app_browser->tab_count());
@@ -967,7 +978,8 @@
// Now try opening another tab in the app popup browser.
app_popup_browser->AddTabWithURL(
GURL(chrome::kAboutBlankURL), GURL(), PageTransition::TYPED, -1,
- TabStripModel::ADD_SELECTED, NULL, std::string());
+ TabStripModel::ADD_SELECTED, NULL, std::string(), &browser_used);
+ EXPECT_EQ(app_popup_browser, browser_used);
// The popup should still only have one tab.
EXPECT_EQ(1, app_popup_browser->tab_count());
« no previous file with comments | « chrome/browser/browser.cc ('k') | chrome/browser/browser_focus_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698