github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 93.0.4539.0 (main) (#29608)

Browse Source 
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Samuel Attard <sam@electronjs.org>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
electron-roller[bot]
2021-06-16 15:43:51 -07:00
committed by GitHub
parent f71c6c04fd
commit 85718349cc
56 changed files with 231 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shell/browser/net/cert_verifier_client.cc
View File

@@ -35,10 +35,10 @@ void CertVerifierClient::Verify(
params.validated_certificate = default_result.verified_cert;
cert_verify_proc_.Run(
params,
base::AdaptCallbackForRepeating(base::BindOnce(
base::BindOnce(
[](VerifyCallback callback, const net::CertVerifyResult& result,
int err) { std::move(callback).Run(err, result); },
std::move(callback), default_result)));
std::move(callback), default_result));
}
} // namespace electron

2
shell/browser/net/cert_verifier_client.h
View File

@@ -28,7 +28,7 @@ class CertVerifierClient : public network::mojom::CertVerifierClient {
public:
using CertVerifyProc =
base::RepeatingCallback<void(const VerifyRequestParams& request,
base::RepeatingCallback<void(int)>)>;
base::OnceCallback<void(int)>)>;
explicit CertVerifierClient(CertVerifyProc proc);
~CertVerifierClient() override;

7
shell/browser/net/proxying_url_loader_factory.cc
View File

@@ -698,11 +698,10 @@ void ProxyingURLLoaderFactory::InProgressRequest::
info_->AddResponseInfoFromResourceResponse(*current_response_);
net::CompletionRepeatingCallback copyable_callback =
base::AdaptCallbackForRepeating(std::move(continuation));
auto callback_pair = base::SplitOnceCallback(std::move(continuation));
DCHECK(info_.has_value());
int result = factory_->web_request_api()->OnHeadersReceived(
&info_.value(), request_, copyable_callback,
&info_.value(), request_, std::move(callback_pair.first),
current_response_->headers.get(), &override_headers_, &redirect_url_);
if (result == net::ERR_BLOCKED_BY_CLIENT) {
OnRequestError(network::URLLoaderCompletionStatus(result));
@@ -722,7 +721,7 @@ void ProxyingURLLoaderFactory::InProgressRequest::
DCHECK_EQ(net::OK, result);
copyable_callback.Run(net::OK);
std::move(callback_pair.second).Run(net::OK);
}
void ProxyingURLLoaderFactory::InProgressRequest::OnRequestError(