chore: bump chromium to 0f4170320ff37e971064916aed1dc (master) (#23285)
* chore: bump chromium in DEPS to 53836640273c3d45b05ad74bdff7323ef0ffc610 * chore: bump chromium in DEPS to 17da1064b910f4170320ff37e971064916aed1dc * Rename attach_same_site_cookies param to force_ignore_site_for_cookies2162209
* chore: update patch indices * Remove single argument HttpResponseHeaders::AddHeader() method2155353
* Rename attach_same_site_cookies param to force_ignore_site_for_cookies2162209
* fixup! Remove single argument HttpResponseHeaders::AddHeader() method * Exchange SandboxType::kInvalid for a CHECK.2167995
* chore: fix string type on windows Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
parent
096c799e24
commit
8edc7a1fb1
40 changed files with 143 additions and 141 deletions
|
@ -349,7 +349,7 @@ gin::Handle<SimpleURLLoaderWrapper> SimpleURLLoaderWrapper::Create(
|
|||
return gin::Handle<SimpleURLLoaderWrapper>();
|
||||
}
|
||||
auto request = std::make_unique<network::ResourceRequest>();
|
||||
request->attach_same_site_cookies = true;
|
||||
request->force_ignore_site_for_cookies = true;
|
||||
opts.Get("method", &request->method);
|
||||
opts.Get("url", &request->url);
|
||||
std::map<std::string, std::string> extra_headers;
|
||||
|
|
|
@ -221,9 +221,8 @@ class AsarURLLoader : public network::mojom::URLLoader {
|
|||
head->did_mime_sniff = true;
|
||||
}
|
||||
if (head->headers) {
|
||||
head->headers->AddHeader(
|
||||
base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentType,
|
||||
head->mime_type.c_str()));
|
||||
head->headers->AddHeader(net::HttpRequestHeaders::kContentType,
|
||||
head->mime_type.c_str());
|
||||
}
|
||||
client_->OnReceiveResponse(std::move(head));
|
||||
client_->OnStartLoadingResponseBody(std::move(pipe.consumer_handle));
|
||||
|
|
|
@ -112,13 +112,13 @@ network::mojom::URLResponseHeadPtr ToResponseHead(
|
|||
if (dict.Get("headers", &headers)) {
|
||||
for (const auto& iter : headers.DictItems()) {
|
||||
if (iter.second.is_string()) {
|
||||
// key: value
|
||||
head->headers->AddHeader(iter.first + ": " + iter.second.GetString());
|
||||
// key, value
|
||||
head->headers->AddHeader(iter.first, iter.second.GetString());
|
||||
} else if (iter.second.is_list()) {
|
||||
// key: [values...]
|
||||
for (const auto& item : iter.second.GetList()) {
|
||||
if (item.is_string())
|
||||
head->headers->AddHeader(iter.first + ": " + item.GetString());
|
||||
head->headers->AddHeader(iter.first, item.GetString());
|
||||
}
|
||||
} else {
|
||||
continue;
|
||||
|
@ -135,7 +135,7 @@ network::mojom::URLResponseHeadPtr ToResponseHead(
|
|||
// Setting |head->mime_type| does not automatically set the "content-type"
|
||||
// header in NetworkService.
|
||||
if (has_mime_type && !has_content_type)
|
||||
head->headers->AddHeader("content-type: " + head->mime_type);
|
||||
head->headers->AddHeader("content-type", head->mime_type);
|
||||
return head;
|
||||
}
|
||||
|
||||
|
@ -376,7 +376,8 @@ void ElectronURLLoaderFactory::StartLoadingFile(
|
|||
return;
|
||||
}
|
||||
|
||||
head->headers->AddHeader(kCORSHeader);
|
||||
// Add header to ignore CORS.
|
||||
head->headers->AddHeader("Access-Control-Allow-Origin", "*");
|
||||
asar::CreateAsarURLLoader(request, std::move(loader), std::move(client),
|
||||
head->headers);
|
||||
}
|
||||
|
@ -484,7 +485,9 @@ void ElectronURLLoaderFactory::SendContents(
|
|||
std::string data) {
|
||||
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
|
||||
std::move(client));
|
||||
head->headers->AddHeader(kCORSHeader);
|
||||
|
||||
// Add header to ignore CORS.
|
||||
head->headers->AddHeader("Access-Control-Allow-Origin", "*");
|
||||
client_remote->OnReceiveResponse(std::move(head));
|
||||
|
||||
// Code bellow follows the pattern of data_url_loader_factory.cc.
|
||||
|
|
|
@ -147,7 +147,7 @@ void ProxyingWebSocket::OnConnectionEstablished(
|
|||
handshake_response_->status_code,
|
||||
handshake_response_->status_text.c_str()));
|
||||
for (const auto& header : handshake_response_->headers)
|
||||
response_->headers->AddHeader(header->name + ": " + header->value);
|
||||
response_->headers->AddHeader(header->name, header->value);
|
||||
|
||||
ContinueToHeadersReceived();
|
||||
}
|
||||
|
|
|
@ -57,6 +57,11 @@ bool RelaunchAppWithHelper(const base::FilePath& helper,
|
|||
StringVector relaunch_argv;
|
||||
relaunch_argv.push_back(helper.value());
|
||||
relaunch_argv.push_back(internal::kRelauncherTypeArg);
|
||||
// Relauncher process has its own --type=relauncher which
|
||||
// is not recognized by the service_manager, explicitly set
|
||||
// the sandbox type to avoid CHECK failure in
|
||||
// service_manager::SandboxTypeFromCommandLine
|
||||
relaunch_argv.push_back(FILE_PATH_LITERAL("--no-sandbox"));
|
||||
|
||||
relaunch_argv.insert(relaunch_argv.end(), relauncher_args.begin(),
|
||||
relauncher_args.end());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue