Commit 71541eb8 authored by Clark DuVall's avatar Clark DuVall Committed by Commit Bot

Fix WebApkIntegrationTests with in-process network service

We set the cert verifier on network context unconditionally since the
FeatureList is not set up at the time the MockCertVerifier is set up in
the WebApkIntegrationTests.  This should be fine if the network service
is run OOP or if network service is disabled, since the cert verifier
set as a global in the browser process for NetworkContext will just be
unused in those cases.

Bug: 917467
Change-Id: Id97f877c955959b88f05167c779abfcd3a10f831
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1635951Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Auto-Submit: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664492}
parent d329a644
......@@ -97,15 +97,11 @@ void ContentMockCertVerifier::SetUpCommandLine(
}
void ContentMockCertVerifier::SetUpInProcessBrowserTestFixture() {
if (IsInProcessNetworkService()) {
network::NetworkContext::SetCertVerifierForTesting(
mock_cert_verifier_.get());
}
network::NetworkContext::SetCertVerifierForTesting(mock_cert_verifier_.get());
}
void ContentMockCertVerifier::TearDownInProcessBrowserTestFixture() {
if (IsInProcessNetworkService())
network::NetworkContext::SetCertVerifierForTesting(nullptr);
network::NetworkContext::SetCertVerifierForTesting(nullptr);
}
ContentMockCertVerifier::CertVerifier*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment