chore: bump chromium to 93.0.4530.0 (master) (#29256)
* chore: bump chromium in DEPS to 92.0.4512.6 * 2887336: [CaptureHandle][#2] Propagate CaptureHandleConfig in browser process2887336
* refactor: base::Optional -> absl::optional * chore: fixup patch indices * chore: bump chromium in DEPS to 92.0.4514.0 * 2899417: Make build work when enable_pdf is set to false.2899417
* 2904731: use BrowserContext instead of Profile in PreconnectManager2904731
* 2295749: fix: check IsSecureEventInputEnabled in constructor before setting SetPasswordInputEnabled to true2295749
* 2893803: Add a GetWebView to RenderFrame.2893803
* 2892345: Implement WebContents::ForEachRenderFrameHost2892345
* chore: fixup patch indices * 2892048: Real instance methods for BrowserContext: remaining 5 methods.2892048
* 2902821: [mojo] Don't require full header includes for referenced interfaces2902821
* 2496500: Remove last deprecated extension Event ctor.2496500
* chore: fixup malformed pepper support patch * chore: bump chromium in DEPS to 92.0.4515.0 * 2908461: Add CreateEmptyPrintPagesParamsPtr() inside print_view_manager_base.cc.2908461
* 2880838: viz: add optional HDRMetadata to TransferableResource2880838
* chore: fixup patch indices * chore: bump chromium in DEPS to 92.0.4515.5 * chore: update patches * chore: bump chromium in DEPS to 92.0.4515.7 * chore: bump chromium in DEPS to 92.0.4515.9 * chore: bump chromium in DEPS to 93.0.4522.0 * chore: bump chromium in DEPS to 93.0.4523.0 * chore: bump chromium in DEPS to 93.0.4524.0 * chore: update patches * chore: enable_pak_file_integrity_checks was reverted * chore: update patches * refactor: base/optional was replaced with absl::optional Refs:2910202
* refactor: replace all usages of base::nullopt with absl::nullopt Refs:2910202
* chore: add missing base::Contains include Refs:2910202
* refactor: replace all usages of base::make_optional with absl::make_optional Refs:2910202
* refactor: replace WorldScriptContext() with GetScriptContextFromWorldId Refs:2893213
* chore: clean up left over opening namespace Refs:95bfe6d08f
* chore: add missing base::Contains include Refs:2910202
* refactor: replace GetCurrentDisplayIterator with the hard checker GetCurrentDisplay This code looks suspicious but if the iterator was invalid before it will also be invalid now. Refs:2893191
* refactor: headers are now passed directly in extensions client Refs:2918906
* refactor: base::DictionaryValue::empty() has been removed Refs:2912424
* chore: add missing includes for network URLLoaderFactory Refs: unknown, probably a side effect of header changes * refactor: make convenience wrapper around AppendArg There is no converter FromV8 for base::StringPiece (apparently its not possible). So we now take in an std::string and use the construct for StringPiece to do implicit conversion. Refs:2905544
* chore: add patch * chore: bump chromium in DEPS to 93.0.4525.0 * chore: update patches * refactor: CanResize has been de-virtualized Refs:2485774
* chore: update resource integrity patch * chore: add character encoding idl patch * chore: bump chromium in DEPS to 93.0.4526.0 * chore: update patches * chore: bump chromium in DEPS to 93.0.4527.0 * chore: bump chromium in DEPS to 93.0.4528.0 * chore: update patches * chore: update idl encoding patch * chore: bump chromium in DEPS to 93.0.4529.0 * chore: update patches * chore: bump chromium in DEPS to 93.0.4530.0 * chore: update patches * fix: only SetCanResize after the widget has been initialized * chore: add patch for vr on windows gn gen * spec: fix focus related tests on linux due to delay in focus swap * chore: remove new usages of base::Optional from main Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@slack-corp.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
This commit is contained in:
parent
8d0ed05c99
commit
8532e1239e
165 changed files with 720 additions and 1048 deletions
|
@ -76,7 +76,7 @@ class AsarURLLoader : public network::mojom::URLLoader {
|
|||
const std::vector<std::string>& removed_headers,
|
||||
const net::HttpRequestHeaders& modified_headers,
|
||||
const net::HttpRequestHeaders& modified_cors_exempt_headers,
|
||||
const base::Optional<GURL>& new_url) override {}
|
||||
const absl::optional<GURL>& new_url) override {}
|
||||
void SetPriority(net::RequestPriority priority,
|
||||
int32_t intra_priority_value) override {}
|
||||
void PauseReadingBodyFromNet() override {}
|
||||
|
|
|
@ -25,7 +25,7 @@ void CertVerifierClient::Verify(
|
|||
const scoped_refptr<net::X509Certificate>& certificate,
|
||||
const std::string& hostname,
|
||||
int flags,
|
||||
const base::Optional<std::string>& ocsp_response,
|
||||
const absl::optional<std::string>& ocsp_response,
|
||||
VerifyCallback callback) {
|
||||
VerifyRequestParams params;
|
||||
params.hostname = hostname;
|
||||
|
|
|
@ -39,7 +39,7 @@ class CertVerifierClient : public network::mojom::CertVerifierClient {
|
|||
const scoped_refptr<net::X509Certificate>& certificate,
|
||||
const std::string& hostname,
|
||||
int flags,
|
||||
const base::Optional<std::string>& ocsp_response,
|
||||
const absl::optional<std::string>& ocsp_response,
|
||||
VerifyCallback callback) override;
|
||||
|
||||
private:
|
||||
|
|
|
@ -45,7 +45,7 @@ void NetworkContextService::ConfigureNetworkContextParams(
|
|||
network_context_params->user_agent = browser_context_->GetUserAgent();
|
||||
|
||||
network_context_params->cors_origin_access_list =
|
||||
content::BrowserContext::GetSharedCorsOriginAccessList(browser_context_)
|
||||
browser_context_->GetSharedCorsOriginAccessList()
|
||||
->GetOriginAccessList()
|
||||
.CreateCorsOriginAccessPatternsList();
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ class NodeStreamLoader : public network::mojom::URLLoader {
|
|||
const std::vector<std::string>& removed_headers,
|
||||
const net::HttpRequestHeaders& modified_headers,
|
||||
const net::HttpRequestHeaders& modified_cors_exempt_headers,
|
||||
const base::Optional<GURL>& new_url) override {}
|
||||
const absl::optional<GURL>& new_url) override {}
|
||||
void SetPriority(net::RequestPriority priority,
|
||||
int32_t intra_priority_value) override {}
|
||||
void PauseReadingBodyFromNet() override {}
|
||||
|
|
|
@ -88,11 +88,11 @@ ProxyingURLLoaderFactory::InProgressRequest::~InProgressRequest() {
|
|||
}
|
||||
if (on_before_send_headers_callback_) {
|
||||
std::move(on_before_send_headers_callback_)
|
||||
.Run(net::ERR_ABORTED, base::nullopt);
|
||||
.Run(net::ERR_ABORTED, absl::nullopt);
|
||||
}
|
||||
if (on_headers_received_callback_) {
|
||||
std::move(on_headers_received_callback_)
|
||||
.Run(net::ERR_ABORTED, base::nullopt, base::nullopt);
|
||||
.Run(net::ERR_ABORTED, absl::nullopt, absl::nullopt);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -178,7 +178,7 @@ void ProxyingURLLoaderFactory::InProgressRequest::FollowRedirect(
|
|||
const std::vector<std::string>& removed_headers,
|
||||
const net::HttpRequestHeaders& modified_headers,
|
||||
const net::HttpRequestHeaders& modified_cors_exempt_headers,
|
||||
const base::Optional<GURL>& new_url) {
|
||||
const absl::optional<GURL>& new_url) {
|
||||
if (new_url)
|
||||
request_.url = new_url.value();
|
||||
|
||||
|
@ -331,7 +331,7 @@ void ProxyingURLLoaderFactory::InProgressRequest::OnBeforeSendHeaders(
|
|||
const net::HttpRequestHeaders& headers,
|
||||
OnBeforeSendHeadersCallback callback) {
|
||||
if (!current_request_uses_header_client_) {
|
||||
std::move(callback).Run(net::OK, base::nullopt);
|
||||
std::move(callback).Run(net::OK, absl::nullopt);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -345,7 +345,7 @@ void ProxyingURLLoaderFactory::InProgressRequest::OnHeadersReceived(
|
|||
const net::IPEndPoint& remote_endpoint,
|
||||
OnHeadersReceivedCallback callback) {
|
||||
if (!current_request_uses_header_client_) {
|
||||
std::move(callback).Run(net::OK, base::nullopt, GURL());
|
||||
std::move(callback).Run(net::OK, absl::nullopt, GURL());
|
||||
|
||||
if (for_cors_preflight_) {
|
||||
// CORS preflight is supported only when "extraHeaders" is specified.
|
||||
|
@ -537,7 +537,7 @@ void ProxyingURLLoaderFactory::InProgressRequest::
|
|||
}
|
||||
|
||||
DCHECK(on_headers_received_callback_);
|
||||
base::Optional<std::string> headers;
|
||||
absl::optional<std::string> headers;
|
||||
if (override_headers_) {
|
||||
headers = override_headers_->raw_headers();
|
||||
if (current_request_uses_header_client_) {
|
||||
|
@ -754,7 +754,7 @@ ProxyingURLLoaderFactory::ProxyingURLLoaderFactory(
|
|||
int view_routing_id,
|
||||
uint64_t* request_id_generator,
|
||||
std::unique_ptr<extensions::ExtensionNavigationUIData> navigation_ui_data,
|
||||
base::Optional<int64_t> navigation_id,
|
||||
absl::optional<int64_t> navigation_id,
|
||||
network::mojom::URLLoaderFactoryRequest loader_request,
|
||||
mojo::PendingRemote<network::mojom::URLLoaderFactory> target_factory_remote,
|
||||
mojo::PendingReceiver<network::mojom::TrustedURLLoaderHeaderClient>
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "base/optional.h"
|
||||
#include "content/public/browser/content_browser_client.h"
|
||||
#include "content/public/browser/render_frame_host.h"
|
||||
#include "extensions/browser/api/web_request/web_request_info.h"
|
||||
|
@ -26,6 +25,7 @@
|
|||
#include "shell/browser/api/electron_api_web_request.h"
|
||||
#include "shell/browser/net/electron_url_loader_factory.h"
|
||||
#include "shell/browser/net/web_request_api_interface.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
||||
namespace electron {
|
||||
|
||||
|
@ -69,7 +69,7 @@ class ProxyingURLLoaderFactory
|
|||
const std::vector<std::string>& removed_headers,
|
||||
const net::HttpRequestHeaders& modified_headers,
|
||||
const net::HttpRequestHeaders& modified_cors_exempt_headers,
|
||||
const base::Optional<GURL>& new_url) override;
|
||||
const absl::optional<GURL>& new_url) override;
|
||||
void SetPriority(net::RequestPriority priority,
|
||||
int32_t intra_priority_value) override;
|
||||
void PauseReadingBodyFromNet() override;
|
||||
|
@ -121,7 +121,7 @@ class ProxyingURLLoaderFactory
|
|||
|
||||
ProxyingURLLoaderFactory* factory_;
|
||||
network::ResourceRequest request_;
|
||||
const base::Optional<url::Origin> original_initiator_;
|
||||
const absl::optional<url::Origin> original_initiator_;
|
||||
const uint64_t request_id_ = 0;
|
||||
const int32_t view_routing_id_ = MSG_ROUTING_NONE;
|
||||
const int32_t frame_routing_id_ = MSG_ROUTING_NONE;
|
||||
|
@ -131,7 +131,7 @@ class ProxyingURLLoaderFactory
|
|||
mojo::Receiver<network::mojom::URLLoader> proxied_loader_receiver_;
|
||||
mojo::Remote<network::mojom::URLLoaderClient> target_client_;
|
||||
|
||||
base::Optional<extensions::WebRequestInfo> info_;
|
||||
absl::optional<extensions::WebRequestInfo> info_;
|
||||
|
||||
network::mojom::URLResponseHeadPtr current_response_;
|
||||
scoped_refptr<net::HttpResponseHeaders> override_headers_;
|
||||
|
@ -166,7 +166,7 @@ class ProxyingURLLoaderFactory
|
|||
std::vector<std::string> removed_headers;
|
||||
net::HttpRequestHeaders modified_headers;
|
||||
net::HttpRequestHeaders modified_cors_exempt_headers;
|
||||
base::Optional<GURL> new_url;
|
||||
absl::optional<GURL> new_url;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(FollowRedirectParams);
|
||||
};
|
||||
|
@ -185,7 +185,7 @@ class ProxyingURLLoaderFactory
|
|||
int view_routing_id,
|
||||
uint64_t* request_id_generator,
|
||||
std::unique_ptr<extensions::ExtensionNavigationUIData> navigation_ui_data,
|
||||
base::Optional<int64_t> navigation_id,
|
||||
absl::optional<int64_t> navigation_id,
|
||||
network::mojom::URLLoaderFactoryRequest loader_request,
|
||||
mojo::PendingRemote<network::mojom::URLLoaderFactory>
|
||||
target_factory_remote,
|
||||
|
@ -245,7 +245,7 @@ class ProxyingURLLoaderFactory
|
|||
const int view_routing_id_;
|
||||
uint64_t* request_id_generator_; // managed by ElectronBrowserClient
|
||||
std::unique_ptr<extensions::ExtensionNavigationUIData> navigation_ui_data_;
|
||||
base::Optional<int64_t> navigation_id_;
|
||||
absl::optional<int64_t> navigation_id_;
|
||||
mojo::ReceiverSet<network::mojom::URLLoaderFactory> proxy_receivers_;
|
||||
mojo::Remote<network::mojom::URLLoaderFactory> target_factory_;
|
||||
mojo::Receiver<network::mojom::TrustedURLLoaderHeaderClient>
|
||||
|
|
|
@ -44,17 +44,17 @@ ProxyingWebSocket::ProxyingWebSocket(
|
|||
/*is_download=*/false,
|
||||
/*is_async=*/true,
|
||||
/*is_service_worker_script=*/false,
|
||||
/*navigation_id=*/base::nullopt,
|
||||
/*navigation_id=*/absl::nullopt,
|
||||
/*ukm_source_id=*/ukm::kInvalidSourceIdObj)) {}
|
||||
|
||||
ProxyingWebSocket::~ProxyingWebSocket() {
|
||||
if (on_before_send_headers_callback_) {
|
||||
std::move(on_before_send_headers_callback_)
|
||||
.Run(net::ERR_ABORTED, base::nullopt);
|
||||
.Run(net::ERR_ABORTED, absl::nullopt);
|
||||
}
|
||||
if (on_headers_received_callback_) {
|
||||
std::move(on_headers_received_callback_)
|
||||
.Run(net::ERR_ABORTED, base::nullopt, GURL());
|
||||
.Run(net::ERR_ABORTED, absl::nullopt, GURL());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -230,7 +230,7 @@ void ProxyingWebSocket::StartProxying(
|
|||
WebSocketFactory factory,
|
||||
const GURL& url,
|
||||
const GURL& site_for_cookies,
|
||||
const base::Optional<std::string>& user_agent,
|
||||
const absl::optional<std::string>& user_agent,
|
||||
mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
|
||||
handshake_client,
|
||||
bool has_extra_headers,
|
||||
|
@ -359,11 +359,11 @@ void ProxyingWebSocket::OnHeadersReceivedComplete(int error_code) {
|
|||
}
|
||||
|
||||
if (on_headers_received_callback_) {
|
||||
base::Optional<std::string> headers;
|
||||
absl::optional<std::string> headers;
|
||||
if (override_headers_)
|
||||
headers = override_headers_->raw_headers();
|
||||
std::move(on_headers_received_callback_)
|
||||
.Run(net::OK, headers, base::nullopt);
|
||||
.Run(net::OK, headers, absl::nullopt);
|
||||
}
|
||||
|
||||
if (override_headers_) {
|
||||
|
@ -385,7 +385,7 @@ void ProxyingWebSocket::OnAuthRequiredComplete(AuthRequiredResponse rv) {
|
|||
switch (rv) {
|
||||
case AuthRequiredResponse::kNoAction:
|
||||
case AuthRequiredResponse::kCancelAuth:
|
||||
std::move(auth_required_callback_).Run(base::nullopt);
|
||||
std::move(auth_required_callback_).Run(absl::nullopt);
|
||||
break;
|
||||
|
||||
case AuthRequiredResponse::kSetAuth:
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "base/optional.h"
|
||||
#include "content/public/browser/content_browser_client.h"
|
||||
#include "extensions/browser/api/web_request/web_request_info.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
|
@ -19,6 +18,7 @@
|
|||
#include "services/network/public/mojom/network_context.mojom.h"
|
||||
#include "services/network/public/mojom/websocket.mojom.h"
|
||||
#include "shell/browser/net/web_request_api_interface.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
#include "url/gurl.h"
|
||||
#include "url/origin.h"
|
||||
|
||||
|
@ -96,7 +96,7 @@ class ProxyingWebSocket : public network::mojom::WebSocketHandshakeClient,
|
|||
WebSocketFactory factory,
|
||||
const GURL& url,
|
||||
const GURL& site_for_cookies,
|
||||
const base::Optional<std::string>& user_agent,
|
||||
const absl::optional<std::string>& user_agent,
|
||||
mojo::PendingRemote<network::mojom::WebSocketHandshakeClient>
|
||||
handshake_client,
|
||||
bool has_extra_headers,
|
||||
|
|
|
@ -52,7 +52,7 @@ void ResolveProxyHelper::StartPendingRequest() {
|
|||
receiver_.BindNewPipeAndPassRemote();
|
||||
receiver_.set_disconnect_handler(
|
||||
base::BindOnce(&ResolveProxyHelper::OnProxyLookupComplete,
|
||||
base::Unretained(this), net::ERR_ABORTED, base::nullopt));
|
||||
base::Unretained(this), net::ERR_ABORTED, absl::nullopt));
|
||||
browser_context_->GetDefaultStoragePartition()
|
||||
->GetNetworkContext()
|
||||
->LookUpProxyForURL(pending_requests_.front().url,
|
||||
|
@ -62,7 +62,7 @@ void ResolveProxyHelper::StartPendingRequest() {
|
|||
|
||||
void ResolveProxyHelper::OnProxyLookupComplete(
|
||||
int32_t net_error,
|
||||
const base::Optional<net::ProxyInfo>& proxy_info) {
|
||||
const absl::optional<net::ProxyInfo>& proxy_info) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
DCHECK(!pending_requests_.empty());
|
||||
|
||||
|
|
|
@ -9,9 +9,9 @@
|
|||
#include <string>
|
||||
|
||||
#include "base/memory/ref_counted.h"
|
||||
#include "base/optional.h"
|
||||
#include "mojo/public/cpp/bindings/receiver.h"
|
||||
#include "services/network/public/mojom/proxy_lookup_client.mojom.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
#include "url/gurl.h"
|
||||
|
||||
namespace electron {
|
||||
|
@ -55,7 +55,7 @@ class ResolveProxyHelper
|
|||
// network::mojom::ProxyLookupClient implementation.
|
||||
void OnProxyLookupComplete(
|
||||
int32_t net_error,
|
||||
const base::Optional<net::ProxyInfo>& proxy_info) override;
|
||||
const absl::optional<net::ProxyInfo>& proxy_info) override;
|
||||
|
||||
// Self-reference. Owned as long as there's an outstanding proxy lookup.
|
||||
scoped_refptr<ResolveProxyHelper> owned_self_;
|
||||
|
|
|
@ -7,18 +7,14 @@
|
|||
|
||||
#include "base/macros.h"
|
||||
#include "base/memory/ref_counted.h"
|
||||
#include "base/optional.h"
|
||||
#include "chrome/browser/net/proxy_config_monitor.h"
|
||||
#include "mojo/public/cpp/bindings/remote.h"
|
||||
#include "services/network/public/cpp/shared_url_loader_factory.h"
|
||||
#include "services/network/public/mojom/network_context.mojom.h"
|
||||
#include "services/network/public/mojom/network_service.mojom.h"
|
||||
|
||||
namespace network {
|
||||
namespace mojom {
|
||||
class URLLoaderFactory;
|
||||
}
|
||||
class SharedURLLoaderFactory;
|
||||
} // namespace network
|
||||
#include "services/network/public/mojom/url_loader.mojom.h"
|
||||
#include "services/network/public/mojom/url_loader_factory.mojom.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
||||
namespace net_log {
|
||||
class NetExportFileWriter;
|
||||
|
|
|
@ -62,7 +62,7 @@ class URLPipeLoader : public network::mojom::URLLoader,
|
|||
const std::vector<std::string>& removed_headers,
|
||||
const net::HttpRequestHeaders& modified_headers,
|
||||
const net::HttpRequestHeaders& modified_cors_exempt_headers,
|
||||
const base::Optional<GURL>& new_url) override {}
|
||||
const absl::optional<GURL>& new_url) override {}
|
||||
void SetPriority(net::RequestPriority priority,
|
||||
int32_t intra_priority_value) override {}
|
||||
void PauseReadingBodyFromNet() override {}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue