| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <algorithm> | 5 #include <algorithm> |
| 6 #include <list> | 6 #include <list> |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "base/metrics/field_trial.h" | 9 #include "base/metrics/field_trial.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 handler1->SetAuth(base::UTF8ToUTF16(username_basic_), | 311 handler1->SetAuth(base::UTF8ToUTF16(username_basic_), |
| 312 base::UTF8ToUTF16(password_)); | 312 base::UTF8ToUTF16(password_)); |
| 313 handler2->SetAuth(base::UTF8ToUTF16(username_digest_), | 313 handler2->SetAuth(base::UTF8ToUTF16(username_digest_), |
| 314 base::UTF8ToUTF16(password_)); | 314 base::UTF8ToUTF16(password_)); |
| 315 | 315 |
| 316 EXPECT_EQ(expected_title1, title_watcher1.WaitAndGetTitle()); | 316 EXPECT_EQ(expected_title1, title_watcher1.WaitAndGetTitle()); |
| 317 EXPECT_EQ(expected_title2, title_watcher2.WaitAndGetTitle()); | 317 EXPECT_EQ(expected_title2, title_watcher2.WaitAndGetTitle()); |
| 318 } | 318 } |
| 319 | 319 |
| 320 // Test login prompt cancellation. | 320 // Test login prompt cancellation. |
| 321 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth) { | 321 // Flaky on Mac crbug.com/636875 |
| 322 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, DISABLED_TestCancelAuth) { |
| 322 ASSERT_TRUE(embedded_test_server()->Start()); | 323 ASSERT_TRUE(embedded_test_server()->Start()); |
| 323 GURL auth_page = embedded_test_server()->GetURL(kAuthBasicPage); | 324 GURL auth_page = embedded_test_server()->GetURL(kAuthBasicPage); |
| 324 GURL no_auth_page_1 = embedded_test_server()->GetURL("/a"); | 325 GURL no_auth_page_1 = embedded_test_server()->GetURL("/a"); |
| 325 GURL no_auth_page_2 = embedded_test_server()->GetURL("/b"); | 326 GURL no_auth_page_2 = embedded_test_server()->GetURL("/b"); |
| 326 GURL no_auth_page_3 = embedded_test_server()->GetURL("/c"); | 327 GURL no_auth_page_3 = embedded_test_server()->GetURL("/c"); |
| 327 | 328 |
| 328 content::WebContents* contents = | 329 content::WebContents* contents = |
| 329 browser()->tab_strip_model()->GetActiveWebContents(); | 330 browser()->tab_strip_model()->GetActiveWebContents(); |
| 330 NavigationController* controller = &contents->GetController(); | 331 NavigationController* controller = &contents->GetController(); |
| 331 | 332 |
| (...skipping 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1469 // out. | 1470 // out. |
| 1470 EXPECT_TRUE( | 1471 EXPECT_TRUE( |
| 1471 WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame())); | 1472 WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame())); |
| 1472 EXPECT_TRUE(contents->ShowingInterstitialPage()); | 1473 EXPECT_TRUE(contents->ShowingInterstitialPage()); |
| 1473 EXPECT_EQ(SSLBlockingPage::kTypeForTesting, contents->GetInterstitialPage() | 1474 EXPECT_EQ(SSLBlockingPage::kTypeForTesting, contents->GetInterstitialPage() |
| 1474 ->GetDelegateForTesting() | 1475 ->GetDelegateForTesting() |
| 1475 ->GetTypeForTesting()); | 1476 ->GetTypeForTesting()); |
| 1476 } | 1477 } |
| 1477 | 1478 |
| 1478 } // namespace | 1479 } // namespace |
| OLD | NEW |