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

Unified Diff: chrome/browser/ssl/ssl_browser_tests.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
Index: chrome/browser/ssl/ssl_browser_tests.cc
===================================================================
--- chrome/browser/ssl/ssl_browser_tests.cc (revision 55729)
+++ chrome/browser/ssl/ssl_browser_tests.cc (working copy)
@@ -499,7 +499,7 @@
"files/ssl/page_displays_insecure_content.html");
TabContents* tab2 = browser()->AddTabWithURL(url, GURL(),
PageTransition::TYPED, 0, TabStripModel::ADD_SELECTED,
- tab1->GetSiteInstance(), std::string());
+ tab1->GetSiteInstance(), std::string(), NULL);
ui_test_utils::WaitForNavigation(&(tab2->controller()));
// The new tab has insecure content.
@@ -531,7 +531,7 @@
https_server->TestServerPage("files/ssl/page_runs_insecure_content.html");
TabContents* tab2 = browser()->AddTabWithURL(url, GURL(),
PageTransition::TYPED, 0, TabStripModel::ADD_SELECTED,
- tab1->GetSiteInstance(), std::string());
+ tab1->GetSiteInstance(), std::string(), NULL);
ui_test_utils::WaitForNavigation(&(tab2->controller()));
// The new tab has insecure content.
@@ -693,11 +693,15 @@
// Let's add another tab to make sure the browser does not exit when we close
// the first tab.
GURL url = http_server->TestServerPage("files/ssl/google.html");
+ Browser* browser_used = NULL;
TabContents* tab2 = browser()->AddTabWithURL(
url, GURL(), PageTransition::TYPED, 0, TabStripModel::ADD_SELECTED, NULL,
- std::string());
+ std::string(), &browser_used);
ui_test_utils::WaitForNavigation(&(tab2->controller()));
+ // Ensure that the tab was created in the correct browser.
+ EXPECT_EQ(browser(), browser_used);
+
// Close the first tab.
browser()->CloseTabContents(tab1);
}
« no previous file with comments | « chrome/browser/sessions/session_restore_browsertest.cc ('k') | chrome/browser/tab_contents/match_preview.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698