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

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

Issue 2400673003: Remove SSLStatus::security_style member and content::SecurityStyle (Closed)
Patch Set: rebase 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 6717 matching lines...) Expand 10 before | Expand all | Expand 10 after
6728 GURL url(https_server.GetURL( 6728 GURL url(https_server.GetURL(
6729 "example.test", 6729 "example.test",
6730 "/mixed-content/non-redundant-cert-error-in-iframe.html")); 6730 "/mixed-content/non-redundant-cert-error-in-iframe.html"));
6731 EXPECT_TRUE(NavigateToURL(shell(), url)); 6731 EXPECT_TRUE(NavigateToURL(shell(), url));
6732 6732
6733 NavigationEntry* entry = 6733 NavigationEntry* entry =
6734 shell()->web_contents()->GetController().GetLastCommittedEntry(); 6734 shell()->web_contents()->GetController().GetLastCommittedEntry();
6735 ASSERT_TRUE(entry); 6735 ASSERT_TRUE(entry);
6736 6736
6737 // The main page was loaded with certificate errors. 6737 // The main page was loaded with certificate errors.
6738 EXPECT_EQ(SECURITY_STYLE_AUTHENTICATION_BROKEN, 6738 EXPECT_TRUE(net::IsCertStatusError(entry->GetSSL().cert_status));
6739 entry->GetSSL().security_style);
6740 6739
6741 // The image that the iframe loaded had certificate errors also, so 6740 // The image that the iframe loaded had certificate errors also, so
6742 // the page should be marked as having displayed subresources with 6741 // the page should be marked as having displayed subresources with
6743 // cert errors. 6742 // cert errors.
6744 EXPECT_TRUE(entry->GetSSL().content_status & 6743 EXPECT_TRUE(entry->GetSSL().content_status &
6745 SSLStatus::DISPLAYED_CONTENT_WITH_CERT_ERRORS); 6744 SSLStatus::DISPLAYED_CONTENT_WITH_CERT_ERRORS);
6746 } 6745 }
6747 6746
6748 // Test setting a cross-origin iframe to display: none. 6747 // Test setting a cross-origin iframe to display: none.
6749 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframeDisplayNone) { 6748 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframeDisplayNone) {
(...skipping 1549 matching lines...) Expand 10 before | Expand all | Expand 10 after
8299 " Site A ------------ proxies for B C\n" 8298 " Site A ------------ proxies for B C\n"
8300 " +--Site B ------- proxies for A C\n" 8299 " +--Site B ------- proxies for A C\n"
8301 " +--Site C -- proxies for A B\n" 8300 " +--Site C -- proxies for A B\n"
8302 "Where A = http://a.com/\n" 8301 "Where A = http://a.com/\n"
8303 " B = http://b.com/\n" 8302 " B = http://b.com/\n"
8304 " C = http://c.com/", 8303 " C = http://c.com/",
8305 DepictFrameTree(root)); 8304 DepictFrameTree(root));
8306 } 8305 }
8307 8306
8308 } // namespace content 8307 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698