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

Unified Diff: third_party/WebKit/Source/core/loader/FrameFetchContextTest.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
Index: third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
index a5febea809251bcb9b24700ff7c7e02808cf7556..cdfccd76fced067004fd5bbfebbba81e17f483cd 100644
--- a/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp
@@ -82,7 +82,7 @@ public:
: EmptyFrameLoaderClient()
{
}
- MOCK_METHOD2(didDisplayContentWithCertificateErrors, void(const KURL&, const CString&));
+ MOCK_METHOD1(didDisplayContentWithCertificateErrors, void(const KURL&));
};
class FrameFetchContextTest : public ::testing::Test {
@@ -144,10 +144,9 @@ protected:
void SetUp() override
{
url = KURL(KURL(), "https://example.test/foo");
- securityInfo = "security info";
mainResourceUrl = KURL(KURL(), "https://www.example.test");
MockFrameLoaderClient* client = new MockFrameLoaderClient;
- EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(url, securityInfo));
+ EXPECT_CALL(*client, didDisplayContentWithCertificateErrors(url));
dummyPageHolder = DummyPageHolder::create(IntSize(500, 500), nullptr, client);
dummyPageHolder->page().setDeviceScaleFactor(1.0);
documentLoader = DocumentLoader::create(&dummyPageHolder->frame(), ResourceRequest(mainResourceUrl), SubstituteData());
@@ -160,7 +159,6 @@ protected:
KURL url;
KURL mainResourceUrl;
- CString securityInfo;
};
class FrameFetchContextUpgradeTest : public FrameFetchContextTest {
@@ -553,7 +551,6 @@ TEST_F(FrameFetchContextDisplayedCertificateErrorsTest, MemoryCacheCertificateEr
ResourceRequest resourceRequest(url);
ResourceResponse response;
response.setURL(url);
- response.setSecurityInfo(securityInfo);
response.setHasMajorCertificateErrors(true);
Resource* resource = Resource::create(resourceRequest, Resource::Image);
resource->setResponse(response);
« no previous file with comments | « third_party/WebKit/Source/core/loader/EmptyClients.h ('k') | third_party/WebKit/Source/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698