| 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 c20e0d5b131928e5ca3e2a9f9f48d3b2142decce..f2557c2dcbcd631b8d2c910d55e885863228d7ef 100644
|
| --- a/third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/MixedContentCheckerTest.cpp
|
| @@ -55,14 +55,15 @@ TEST(MixedContentCheckerTest, IsMixedContent) {
|
| };
|
|
|
| for (const auto& test : cases) {
|
| - SCOPED_TRACE(::testing::Message() << "Origin: " << test.origin
|
| - << ", Target: " << test.target
|
| - << ", Expectation: " << test.expectation);
|
| + SCOPED_TRACE(::testing::Message()
|
| + << "Origin: " << test.origin << ", Target: " << test.target
|
| + << ", Expectation: " << test.expectation);
|
| KURL originUrl(KURL(), test.origin);
|
| RefPtr<SecurityOrigin> securityOrigin(SecurityOrigin::create(originUrl));
|
| KURL targetUrl(KURL(), test.target);
|
| - EXPECT_EQ(test.expectation, MixedContentChecker::isMixedContent(
|
| - securityOrigin.get(), targetUrl));
|
| + EXPECT_EQ(
|
| + test.expectation,
|
| + MixedContentChecker::isMixedContent(securityOrigin.get(), targetUrl));
|
| }
|
| }
|
|
|
| @@ -132,12 +133,12 @@ TEST(MixedContentCheckerTest, HandleCertificateError) {
|
| ResourceResponse response2;
|
| WebURLRequest::RequestContext requestContext =
|
| WebURLRequest::RequestContextImage;
|
| - ASSERT_EQ(
|
| - WebMixedContentContextType::OptionallyBlockable,
|
| - WebMixedContent::contextTypeFromRequestContext(
|
| - requestContext, dummyPageHolder->frame()
|
| - .settings()
|
| - ->getStrictMixedContentCheckingForPlugin()));
|
| + ASSERT_EQ(WebMixedContentContextType::OptionallyBlockable,
|
| + WebMixedContent::contextTypeFromRequestContext(
|
| + requestContext,
|
| + dummyPageHolder->frame()
|
| + .settings()
|
| + ->getStrictMixedContentCheckingForPlugin()));
|
| response2.setURL(displayedUrl);
|
| EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(displayedUrl));
|
| MixedContentChecker::handleCertificateError(
|
|
|