| Index: chrome/browser/ssl/ssl_browser_tests.cc
|
| diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
|
| index 15b71f3ff8071c1701a171124fe4503fa5e5fe04..79b43a802d5f8e0d7caf4f7085876fc155f44519 100644
|
| --- a/chrome/browser/ssl/ssl_browser_tests.cc
|
| +++ b/chrome/browser/ssl/ssl_browser_tests.cc
|
| @@ -643,9 +643,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestBadHTTPSDownload) {
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| content::NotificationService::AllSources());
|
| - browser::NavigateParams navigate_params(browser(), url_dangerous,
|
| - content::PAGE_TRANSITION_TYPED);
|
| - browser::Navigate(&navigate_params);
|
| + chrome::NavigateParams navigate_params(browser(), url_dangerous,
|
| + content::PAGE_TRANSITION_TYPED);
|
| + chrome::Navigate(&navigate_params);
|
| observer.Wait();
|
| }
|
|
|
| @@ -802,15 +802,14 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentTwoTabs) {
|
| &replacement_path));
|
|
|
| GURL url = https_server_.GetURL(replacement_path);
|
| - browser::NavigateParams params(
|
| - browser(), url, content::PAGE_TRANSITION_TYPED);
|
| + chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_TYPED);
|
| params.disposition = NEW_FOREGROUND_TAB;
|
| params.tabstrip_index = 0;
|
| params.source_contents = tab1;
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| content::NotificationService::AllSources());
|
| - browser::Navigate(¶ms);
|
| + chrome::Navigate(¶ms);
|
| TabContents* tab2 = params.target_contents;
|
| observer.Wait();
|
|
|
| @@ -846,14 +845,13 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecureContentTwoTabs) {
|
| // disposition won't usually stay in the same process, but this works
|
| // because we are using process-per-site in SetUpCommandLine.
|
| GURL url = https_server_.GetURL(replacement_path);
|
| - browser::NavigateParams params(
|
| - browser(), url, content::PAGE_TRANSITION_TYPED);
|
| + chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_TYPED);
|
| params.disposition = NEW_FOREGROUND_TAB;
|
| params.source_contents = tab1;
|
| ui_test_utils::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| content::NotificationService::AllSources());
|
| - browser::Navigate(¶ms);
|
| + chrome::Navigate(¶ms);
|
| TabContents* tab2 = params.target_contents;
|
| observer.Wait();
|
|
|
|
|