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

Unified Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 3834002: Make all browser code use browser::Navigate to open tabs.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 2 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/sessions/session_restore_browsertest.cc ('k') | chrome/browser/tabs/tab_strip_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_browser_tests.cc
===================================================================
--- chrome/browser/ssl/ssl_browser_tests.cc (revision 64601)
+++ chrome/browser/ssl/ssl_browser_tests.cc (working copy)
@@ -5,6 +5,7 @@
#include "base/time.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/browser.h"
+#include "chrome/browser/browser_navigator.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/interstitial_page.h"
@@ -454,10 +455,12 @@
// Create a new tab.
GURL url = https_server_.GetURL(
"files/ssl/page_displays_insecure_content.html");
- Browser::AddTabWithURLParams params(url, PageTransition::TYPED);
- params.index = 0;
- params.instance = tab1->GetSiteInstance();
- TabContents* tab2 = browser()->AddTabWithURL(&params);
+ browser::NavigateParams params(browser(), url, PageTransition::TYPED);
+ params.disposition = NEW_FOREGROUND_TAB;
+ params.tabstrip_index = 0;
+ params.source_contents = tab1;
+ browser::Navigate(&params);
+ TabContents* tab2 = params.target_contents;
ui_test_utils::WaitForNavigation(&(tab2->controller()));
// The new tab has insecure content.
@@ -485,9 +488,11 @@
// Create a new tab.
GURL url =
https_server_.GetURL("files/ssl/page_runs_insecure_content.html");
- Browser::AddTabWithURLParams params(url, PageTransition::TYPED);
- params.instance = tab1->GetSiteInstance();
- TabContents* tab2 = browser()->AddTabWithURL(&params);
+ browser::NavigateParams params(browser(), url, PageTransition::TYPED);
+ params.disposition = NEW_FOREGROUND_TAB;
+ params.source_contents = tab1;
+ browser::Navigate(&params);
+ TabContents* tab2 = params.target_contents;
ui_test_utils::WaitForNavigation(&(tab2->controller()));
// The new tab has insecure content.
@@ -629,13 +634,10 @@
// Let's add another tab to make sure the browser does not exit when we close
// the first tab.
GURL url = test_server()->GetURL("files/ssl/google.html");
- Browser::AddTabWithURLParams params(url, PageTransition::TYPED);
- TabContents* tab2 = browser()->AddTabWithURL(&params);
+ TabContents* tab2 =
+ browser()->AddSelectedTabWithURL(url, PageTransition::TYPED);
ui_test_utils::WaitForNavigation(&(tab2->controller()));
- // Ensure that the tab was created in the correct browser.
- EXPECT_EQ(browser(), params.target);
-
// Close the first tab.
browser()->CloseTabContents(tab1);
}
« no previous file with comments | « chrome/browser/sessions/session_restore_browsertest.cc ('k') | chrome/browser/tabs/tab_strip_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698