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_cookies

2162209

* chore: update patch indices

* Remove single argument HttpResponseHeaders::AddHeader() method

2155353

* Rename attach_same_site_cookies param to force_ignore_site_for_cookies

2162209

* 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:
Electron Bot 2020-04-30 13:20:44 -07:00 committed by GitHub
parent 096c799e24
commit 8edc7a1fb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 143 additions and 141 deletions

View file

@ -42,7 +42,7 @@ index 906a1ee4ac58b0744a32153bbaafeac4322a60e4..c90f4aead36cbf3767dc5094728963c2
// another SiteInstance for the same site.
void RegisterSiteInstance(SiteInstanceImpl* site_instance);
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 38f5ab2f17586cc46ba9654ca1cbaf54e45ee525..fb642e30369056727809ae710ec745ac3623a267 100644
index 26fd7bdfb902508922b9a4c5f9f42ae9182356d4..fcd4f21f54066057a48b7b34657177fb28a80cf5 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -1284,6 +1284,24 @@ void NavigationRequest::BeginNavigation() {
@ -71,10 +71,10 @@ index 38f5ab2f17586cc46ba9654ca1cbaf54e45ee525..fb642e30369056727809ae710ec745ac
render_frame_host_ =
frame_tree_node_->render_manager()->GetFrameHostForNavigation(this);
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 1cf2081ae8642dd22ebe57e08457c26af4fad830..f7d8fb884712a921419de274106a6166ccf7e9f3 100644
index 0feececd533b3e53b8dcfd36caf0f41fbd595fd2..b1e983078c3693c45ff30075e38f0ccef93206f3 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -2399,6 +2399,16 @@ bool RenderFrameHostManager::InitRenderView(
@@ -2391,6 +2391,16 @@ bool RenderFrameHostManager::InitRenderView(
scoped_refptr<SiteInstance>
RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
NavigationRequest* request) {
@ -91,7 +91,7 @@ index 1cf2081ae8642dd22ebe57e08457c26af4fad830..f7d8fb884712a921419de274106a6166
SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
// All children of MHTML documents must be MHTML documents. They all live in
@@ -2418,10 +2428,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2410,10 +2420,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
//
// TODO(clamy): We should also consider as a candidate SiteInstance the
// speculative SiteInstance that was computed on redirects.
@ -156,7 +156,7 @@ index 1cf2081ae8642dd22ebe57e08457c26af4fad830..f7d8fb884712a921419de274106a6166
// Account for renderer-initiated reload as well.
// Needed as a workaround for https://crbug.com/1045524, remove it when it is
@@ -2464,6 +2524,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -2456,6 +2516,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request->ResetStateForSiteInstanceChange();
}
@ -194,7 +194,7 @@ index 85288dac0acfb51330669cd87cfc0343af3dfd2c..3bb39459fd3c87a0968044e02d684f6b
size_t GetRelatedActiveContentsCount() override;
bool RequiresDedicatedProcess() override;
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index aeff1a685fc22c2e8fe988856cb529028f102182..3708b4ac6125abb95f333192dd2d7c09e7deb377 100644
index c9fc489ded15dc3cfcdd71c86707e6e86a7e6ba3..96f7423b78c16b119b761b47c317d8c326a1868d 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -57,6 +57,21 @@
@ -220,10 +220,10 @@ index aeff1a685fc22c2e8fe988856cb529028f102182..3708b4ac6125abb95f333192dd2d7c09
const MainFunctionParams& parameters) {
return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index be343c7f4a9e412fbb7b43cc908b8bdcb12aa533..0321dca8ba52be7d5e51f14e2f5cf94234cbd341 100644
index 2d8d316f948fbc25fd4b1aa899b38ba2607e24a1..6a9d69ee79eafe531bd974e3648e107a4c6de1e1 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -232,8 +232,45 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -234,8 +234,45 @@ class CONTENT_EXPORT ContentBrowserClient {
using IsClipboardPasteAllowedCallback =
base::OnceCallback<void(ClipboardPasteAllowed)>;