third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp - Issue 2315443003: Stop sending serialized SSLStatus to the renderer.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp

Issue 2315443003: Stop sending serialized SSLStatus to the renderer. (Closed)

Patch Set: self review fix and merge fix Created 4 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/loader/MixedContentChecker.cpp ('k') | third_party/WebKit/Source/platform/exported/WebURLResponse.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp

diff --git a/third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp b/third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp

index 6e1ea8399e6143df76aacdc4b976db34b376d320..1dd05d64a588a5f3aa82b35d2cf3294f34ee37b8 100644

--- a/third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp

+++ b/third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp

@@ -84,8 +84,8 @@ namespace {

: EmptyFrameLoaderClient()

{

}

- MOCK_METHOD2(didDisplayContentWithCertificateErrors, void(const KURL&, const CString&));

- MOCK_METHOD2(didRunContentWithCertificateErrors, void(const KURL&, const CString&));

+ MOCK_METHOD1(didDisplayContentWithCertificateErrors, void(const KURL&));

+ MOCK_METHOD1(didRunContentWithCertificateErrors, void(const KURL&));

};

} // namespace

@@ -102,16 +102,14 @@ TEST(MixedContentCheckerTest, HandleCertificateError)

dummyPageHolder->frame().document()->setURL(mainResourceUrl);

ResourceResponse response1;

response1.setURL(ranUrl);

- response1.setSecurityInfo("security info1");

- EXPECT_CALL(*client, didRunContentWithCertificateErrors(ranUrl, response1.getSecurityInfo()));

+ EXPECT_CALL(*client, didRunContentWithCertificateErrors(ranUrl));

MixedContentChecker::handleCertificateError(&dummyPageHolder->frame(), response1, WebURLRequest::FrameTypeNone, WebURLRequest::RequestContextScript);

ResourceResponse response2;

WebURLRequest::RequestContext requestContext = WebURLRequest::RequestContextImage;

ASSERT_EQ(WebMixedContent::ContextType::OptionallyBlockable, WebMixedContent::contextTypeFromRequestContext(requestContext, dummyPageHolder->frame().settings()->strictMixedContentCheckingForPlugin()));

response2.setURL(displayedUrl);

- response2.setSecurityInfo("security info2");

- EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(displayedUrl, response2.getSecurityInfo()));

+ EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(displayedUrl));

MixedContentChecker::handleCertificateError(&dummyPageHolder->frame(), response2, WebURLRequest::FrameTypeNone, requestContext);

}