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

Side by Side Diff: content/browser/site_per_process_browsertest.cc

Issue 2400673003: Remove SSLStatus::security_style member and content::SecurityStyle (Closed)
Patch Set: more curly braces Created 4 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 unified diff | Download patch
OLDNEW
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 "content/browser/site_per_process_browsertest.h" 5 #include "content/browser/site_per_process_browsertest.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 6721 matching lines...) Expand 10 before | Expand all | Expand 10 after
6732 GURL url(https_server.GetURL( 6732 GURL url(https_server.GetURL(
6733 "example.test", 6733 "example.test",
6734 "/mixed-content/non-redundant-cert-error-in-iframe.html")); 6734 "/mixed-content/non-redundant-cert-error-in-iframe.html"));
6735 EXPECT_TRUE(NavigateToURL(shell(), url)); 6735 EXPECT_TRUE(NavigateToURL(shell(), url));
6736 6736
6737 NavigationEntry* entry = 6737 NavigationEntry* entry =
6738 shell()->web_contents()->GetController().GetLastCommittedEntry(); 6738 shell()->web_contents()->GetController().GetLastCommittedEntry();
6739 ASSERT_TRUE(entry); 6739 ASSERT_TRUE(entry);
6740 6740
6741 // The main page was loaded with certificate errors. 6741 // The main page was loaded with certificate errors.
6742 EXPECT_EQ(SECURITY_STYLE_AUTHENTICATION_BROKEN, 6742 EXPECT_TRUE(net::IsCertStatusError(entry->GetSSL().cert_status));
6743 entry->GetSSL().security_style);
6744 6743
6745 // The image that the iframe loaded had certificate errors also, so 6744 // The image that the iframe loaded had certificate errors also, so
6746 // the page should be marked as having displayed subresources with 6745 // the page should be marked as having displayed subresources with
6747 // cert errors. 6746 // cert errors.
6748 EXPECT_TRUE(entry->GetSSL().content_status & 6747 EXPECT_TRUE(entry->GetSSL().content_status &
6749 SSLStatus::DISPLAYED_CONTENT_WITH_CERT_ERRORS); 6748 SSLStatus::DISPLAYED_CONTENT_WITH_CERT_ERRORS);
6750 } 6749 }
6751 6750
6752 // Test setting a cross-origin iframe to display: none. 6751 // Test setting a cross-origin iframe to display: none.
6753 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframeDisplayNone) { 6752 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframeDisplayNone) {
(...skipping 1586 matching lines...) Expand 10 before | Expand all | Expand 10 after
8340 // Now have the cross-process navigation commit and mark the current RFH as 8339 // Now have the cross-process navigation commit and mark the current RFH as
8341 // pending deletion. 8340 // pending deletion.
8342 cross_site_manager.WaitForNavigationFinished(); 8341 cross_site_manager.WaitForNavigationFinished();
8343 8342
8344 // Resume the navigation in the previous RFH that has just been marked as 8343 // Resume the navigation in the previous RFH that has just been marked as
8345 // pending deletion. We should not crash. 8344 // pending deletion. We should not crash.
8346 transfer_manager.WaitForNavigationFinished(); 8345 transfer_manager.WaitForNavigationFinished();
8347 } 8346 }
8348 8347
8349 } // namespace content 8348 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/service_worker/service_worker_browsertest.cc ('k') | content/browser/ssl/ssl_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698