| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "core/loader/MixedContentChecker.h" | 5 #include "core/loader/MixedContentChecker.h" |
| 6 | 6 |
| 7 #include "core/frame/Settings.h" | 7 #include "core/frame/Settings.h" |
| 8 #include "core/loader/EmptyClients.h" | 8 #include "core/loader/EmptyClients.h" |
| 9 #include "core/testing/DummyPageHolder.h" | 9 #include "core/testing/DummyPageHolder.h" |
| 10 #include "platform/network/ResourceResponse.h" | 10 #include "platform/network/ResourceResponse.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 ResourceResponse response1; | 119 ResourceResponse response1; |
| 120 response1.setURL(ranUrl); | 120 response1.setURL(ranUrl); |
| 121 EXPECT_CALL(*client, didRunContentWithCertificateErrors(ranUrl)); | 121 EXPECT_CALL(*client, didRunContentWithCertificateErrors(ranUrl)); |
| 122 MixedContentChecker::handleCertificateError( | 122 MixedContentChecker::handleCertificateError( |
| 123 &dummyPageHolder->frame(), response1, WebURLRequest::FrameTypeNone, | 123 &dummyPageHolder->frame(), response1, WebURLRequest::FrameTypeNone, |
| 124 WebURLRequest::RequestContextScript); | 124 WebURLRequest::RequestContextScript); |
| 125 | 125 |
| 126 ResourceResponse response2; | 126 ResourceResponse response2; |
| 127 WebURLRequest::RequestContext requestContext = | 127 WebURLRequest::RequestContext requestContext = |
| 128 WebURLRequest::RequestContextImage; | 128 WebURLRequest::RequestContextImage; |
| 129 ASSERT_EQ(WebMixedContent::ContextType::OptionallyBlockable, | 129 ASSERT_EQ( |
| 130 WebMixedContent::contextTypeFromRequestContext( | 130 WebMixedContent::ContextType::OptionallyBlockable, |
| 131 requestContext, dummyPageHolder->frame() | 131 WebMixedContent::contextTypeFromRequestContext( |
| 132 .settings() | 132 requestContext, dummyPageHolder->frame() |
| 133 ->strictMixedContentCheckingForPlugin())); | 133 .settings() |
| 134 ->getStrictMixedContentCheckingForPlugin())); |
| 134 response2.setURL(displayedUrl); | 135 response2.setURL(displayedUrl); |
| 135 EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(displayedUrl)); | 136 EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(displayedUrl)); |
| 136 MixedContentChecker::handleCertificateError( | 137 MixedContentChecker::handleCertificateError( |
| 137 &dummyPageHolder->frame(), response2, WebURLRequest::FrameTypeNone, | 138 &dummyPageHolder->frame(), response2, WebURLRequest::FrameTypeNone, |
| 138 requestContext); | 139 requestContext); |
| 139 } | 140 } |
| 140 | 141 |
| 141 } // namespace blink | 142 } // namespace blink |
| OLD | NEW |