diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-29 01:55:38 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-29 01:55:38 +0000 |
| commit | 715af7e54de3111942c62841a64c6f3584c93877 (patch) | |
| tree | 2668603d9deb872ea71a7ca319639a68f81e0b0a /chrome/browser/ssl | |
| parent | 451bbe386a9fc28d4ea7c43277fce65248edba20 (diff) | |
| download | chromium_src-715af7e54de3111942c62841a64c6f3584c93877.zip chromium_src-715af7e54de3111942c62841a64c6f3584c93877.tar.gz chromium_src-715af7e54de3111942c62841a64c6f3584c93877.tar.bz2 | |
Nukes one of the AddTabWithURL variants.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1736022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 5d6ba7b..d158ac2 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -489,10 +489,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestMixedContentsTwoTabs) { // Create a new tab. GURL url = https_server->TestServerPageW(L"files/ssl/page_with_http_script.html"); - TabContents* tab2 = browser()->AddTabWithURL(url, - GURL(), - PageTransition::TYPED, true, 0, - false, NULL); + TabContents* tab2 = browser()->AddTabWithURL( + url, GURL(), PageTransition::TYPED, 0, Browser::ADD_SELECTED, + NULL, std::string()); ui_test_utils::WaitForNavigation(&(tab2->controller())); // The new tab has mixed content. @@ -626,10 +625,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) { // Let's add another tab to make sure the browser does not exit when we close // the first tab. GURL url = http_server->TestServerPageW(L"files/ssl/google.html"); - TabContents* tab2 = browser()->AddTabWithURL(url, - GURL(), - PageTransition::TYPED, - true, 0, false, NULL); + TabContents* tab2 = browser()->AddTabWithURL( + url, GURL(), PageTransition::TYPED, 0, Browser::ADD_SELECTED, NULL, + std::string()); ui_test_utils::WaitForNavigation(&(tab2->controller())); // Close the first tab. |