| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "chrome/browser/browser.h" | 5 #include "chrome/browser/browser.h" |
| 6 #include "chrome/browser/profile.h" | 6 #include "chrome/browser/profile.h" |
| 7 #include "chrome/browser/tab_contents/interstitial_page.h" | 7 #include "chrome/browser/tab_contents/interstitial_page.h" |
| 8 #include "chrome/browser/tab_contents/navigation_entry.h" | 8 #include "chrome/browser/tab_contents/navigation_entry.h" |
| 9 #include "chrome/browser/tab_contents/tab_contents.h" | 9 #include "chrome/browser/tab_contents/tab_contents.h" |
| 10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
| (...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 | 557 |
| 558 // | 558 // |
| 559 // Frame navigation | 559 // Frame navigation |
| 560 // | 560 // |
| 561 | 561 |
| 562 // From a good HTTPS top frame: | 562 // From a good HTTPS top frame: |
| 563 // - navigate to an OK HTTPS frame | 563 // - navigate to an OK HTTPS frame |
| 564 // - navigate to a bad HTTPS (expect unsafe content and filtered frame), then | 564 // - navigate to a bad HTTPS (expect unsafe content and filtered frame), then |
| 565 // back | 565 // back |
| 566 // - navigate to HTTP (expect mixed content), then back | 566 // - navigate to HTTP (expect mixed content), then back |
| 567 IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) { | 567 IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) { |
| 568 scoped_refptr<HTTPTestServer> http_server = PlainServer(); | 568 scoped_refptr<HTTPTestServer> http_server = PlainServer(); |
| 569 scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer(); | 569 scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer(); |
| 570 scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); | 570 scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); |
| 571 | 571 |
| 572 TabContents* tab = browser()->GetSelectedTabContents(); | 572 TabContents* tab = browser()->GetSelectedTabContents(); |
| 573 ui_test_utils::NavigateToURL( | 573 ui_test_utils::NavigateToURL( |
| 574 browser(), | 574 browser(), |
| 575 good_https_server->TestServerPageW(L"files/ssl/top_frame.html")); | 575 good_https_server->TestServerPageW(L"files/ssl/top_frame.html")); |
| 576 | 576 |
| 577 CheckAuthenticatedState(tab, false, false); | 577 CheckAuthenticatedState(tab, false, false); |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 721 | 721 |
| 722 // Visit a page over https that contains a frame with a redirect. | 722 // Visit a page over https that contains a frame with a redirect. |
| 723 | 723 |
| 724 // XMLHttpRequest mixed in synchronous mode. | 724 // XMLHttpRequest mixed in synchronous mode. |
| 725 | 725 |
| 726 // XMLHttpRequest mixed in asynchronous mode. | 726 // XMLHttpRequest mixed in asynchronous mode. |
| 727 | 727 |
| 728 // XMLHttpRequest over bad ssl in synchronous mode. | 728 // XMLHttpRequest over bad ssl in synchronous mode. |
| 729 | 729 |
| 730 // XMLHttpRequest over OK ssl in synchronous mode. | 730 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |