Updated patches from Chromium 104.0.5112.10 to Chromium 104.0.5112.12.
This commit is contained in:
committed by
Claudio DeSouza
parent
09f522c947
commit
e55a3a148e
@@ -1,8 +1,8 @@
|
||||
diff --git a/base/BUILD.gn b/base/BUILD.gn
|
||||
index 3d13052ffc51fb32791bba343f87c50e33f8acfb..550f25ceb7af3e83ef000b5b79e5377bfc3b8aa6 100644
|
||||
index 2b1a93670de430138c32493e2eabe475d7839c23..f1995c0b72443d7086de809132aeaadfd221d506 100644
|
||||
--- a/base/BUILD.gn
|
||||
+++ b/base/BUILD.gn
|
||||
@@ -4200,6 +4200,7 @@ if (is_android) {
|
||||
@@ -4202,6 +4202,7 @@ if (is_android) {
|
||||
"android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
|
||||
"android/java/src/org/chromium/base/time/Timer.java",
|
||||
]
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
diff --git a/components/safe_browsing/content/browser/safe_browsing_network_context.cc b/components/safe_browsing/content/browser/safe_browsing_network_context.cc
|
||||
index 43daf77b1c4384b4ed0fea4273edfa9a49eac6a3..8a011534ec3f3171dad89f8fb5a036bcb1c6517f 100644
|
||||
index d54a8f6f93211572d29dcfea87287f220a58548b..4dd8138efc61bdb2d493968a9e2379d2fe714d83 100644
|
||||
--- a/components/safe_browsing/content/browser/safe_browsing_network_context.cc
|
||||
+++ b/components/safe_browsing/content/browser/safe_browsing_network_context.cc
|
||||
@@ -80,8 +80,8 @@ class SafeBrowsingNetworkContext::SharedURLLoaderFactory
|
||||
@@ -85,8 +85,8 @@ class SafeBrowsingNetworkContext::SharedURLLoaderFactory
|
||||
override {
|
||||
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
|
||||
GetURLLoaderFactory()->CreateLoaderAndStart(
|
||||
|
||||
Reference in New Issue
Block a user