Update to Chromium version 87.0.4280.47

This commit is contained in:
Marshall Greenblatt
2020-11-10 18:39:06 -05:00
parent 04acc3ebc4
commit bbf40c7646
5 changed files with 17 additions and 17 deletions

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 7e37891fc3d5..1e1f49a8be8d 100644
index 4dd4cabe46e1..ac61cbbaf234 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/crypto.gni")
@@ -10,7 +10,7 @@ index 7e37891fc3d5..1e1f49a8be8d 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni")
@@ -1880,6 +1881,7 @@ static_library("browser") {
@@ -1885,6 +1886,7 @@ static_library("browser") {
"//build:branding_buildflags",
"//build:chromeos_buildflags",
"//cc",
@@ -18,7 +18,7 @@ index 7e37891fc3d5..1e1f49a8be8d 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2358,6 +2360,10 @@ static_library("browser") {
@@ -2363,6 +2365,10 @@ static_library("browser") {
]
}
@@ -29,7 +29,7 @@ index 7e37891fc3d5..1e1f49a8be8d 100644
if (is_android) {
sources += [
"after_startup_task_utils_android.cc",
@@ -4832,7 +4838,7 @@ static_library("browser") {
@@ -4837,7 +4843,7 @@ static_library("browser") {
]
}

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index a90aab26681e..32202ca7509a 100644
index ea9c946036b3..1ed77f3895de 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/crypto.gni")
@@ -29,7 +29,7 @@ index a90aab26681e..32202ca7509a 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -1525,6 +1531,7 @@ static_library("ui") {
@@ -1527,6 +1533,7 @@ static_library("ui") {
"//components/page_load_metrics/browser",
"//components/performance_manager:site_data_proto",
"//components/printing/browser",
@@ -37,7 +37,7 @@ index a90aab26681e..32202ca7509a 100644
"//components/profile_metrics",
"//components/safety_check",
"//components/search_provider_logos",
@@ -3243,7 +3250,9 @@ static_library("ui") {
@@ -3245,7 +3252,9 @@ static_library("ui") {
"views/frame/browser_desktop_window_tree_host_platform.h",
]
}

View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 796ebba32a03..3981a000f788 100644
index c2c0288e048d..617bb86f7ad9 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -1035,10 +1035,6 @@ void LaunchURL(const GURL& url,
@@ -1036,10 +1036,6 @@ void LaunchURL(const GURL& url,
}
}
@@ -13,7 +13,7 @@ index 796ebba32a03..3981a000f788 100644
void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
// |allowlist| combines pref/policy + cmdline switch in the browser process.
// For renderer and utility (e.g. NetworkService) processes the switch is the
@@ -1217,6 +1213,14 @@ const blink::UserAgentBrandList& GetBrandVersionList() {
@@ -1218,6 +1214,14 @@ const blink::UserAgentBrandList& GetBrandVersionList() {
return *greased_brand_version_list;
}
@@ -29,7 +29,7 @@ index 796ebba32a03..3981a000f788 100644
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kUserAgent)) {
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
index ef7da4343581..93ad5e8b1d9b 100644
index 4077ac522067..649226ac2ba8 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -98,7 +98,8 @@ class ChromeXrIntegrationClient;

View File

@@ -253,7 +253,7 @@ index da3aceed75b1..e88601502e28 100644
#include <utility>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index 27b7e117b531..80c92eed565d 100644
index 811bc7be6b17..57128cf9c9a5 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -31,6 +31,7 @@
@@ -264,7 +264,7 @@ index 27b7e117b531..80c92eed565d 100644
#include "content/public/common/page_visibility_state.h"
#include "content/public/common/window_container_type.mojom-forward.h"
#include "device/vr/buildflags/buildflags.h"
@@ -1685,6 +1686,14 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1693,6 +1694,14 @@ class CONTENT_EXPORT ContentBrowserClient {
const base::Optional<url::Origin>& initiating_origin,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
@@ -279,7 +279,7 @@ index 27b7e117b531..80c92eed565d 100644
// Creates an OverlayWindow to be used for Picture-in-Picture. This window
// will house the content shown when in Picture-in-Picture mode. This will
// return a new OverlayWindow.
@@ -1756,6 +1765,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1764,6 +1773,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();
@@ -354,10 +354,10 @@ index e811aec4853c..a1c857d4c6cc 100644
if (!found)
return nullptr;
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index 91daa69bf55a..40f79ddf47b9 100644
index 6fae8670bf01..70ddb11f0f93 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -636,6 +636,8 @@ void RenderThreadImpl::Init() {
@@ -632,6 +632,8 @@ void RenderThreadImpl::Init() {
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
URLLoaderThrottleProviderType::kFrame);