BASELINE: Update Chromium to 80.0.3987.136

Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

4 files changed, 60 insertions, 2 deletions

diff --git a/chromium/chrome/browser/notifications/chime/android/BUILD.gn b/chromium/chrome/browser/notifications/chime/android/BUILD.gn
new file mode 100644
index 00000000000..53fe51cab77
--- /dev/null
+++ b/chromium/chrome/browser/notifications/chime/android/BUILD.gn
@@ -0,0 +1,37 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+
+android_library("java") {
+  java_files = [ "java/src/org/chromium/chrome/browser/notifications/chime/ChimeSession.java" ]
+
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+
+  deps = [
+    "//base:base_java",
+    "//base:jni_java",
+    "//chrome/android/modules/chime/public:java",
+  ]
+}
+
+source_set("android") {
+  sources = [
+    "features.cc",
+    "features.h",
+  ]
+
+  deps = [
+    ":jni_headers",
+    "//base",
+  ]
+}
+
+generate_jni("jni_headers") {
+  visibility = [ ":*" ]
+
+  sources = [
+    "java/src/org/chromium/chrome/browser/notifications/chime/ChimeSession.java",
+  ]
+}
diff --git a/chromium/chrome/browser/notifications/scheduler/BUILD.gn b/chromium/chrome/browser/notifications/scheduler/BUILD.gn
index 1927f8f6c0f..02f3321e230 100644
--- a/chromium/chrome/browser/notifications/scheduler/BUILD.gn
+++ b/chromium/chrome/browser/notifications/scheduler/BUILD.gn
@@ -35,5 +35,6 @@ group("unit_tests") {
   testonly = true
   deps = [
     "//chrome/browser/notifications/scheduler/internal:unit_tests",
+    "//chrome/browser/notifications/scheduler/public:unit_tests",
   ]
 }
diff --git a/chromium/chrome/browser/notifications/scheduler/public/BUILD.gn b/chromium/chrome/browser/notifications/scheduler/public/BUILD.gn
index a08c8aa0d3c..020c9a7b894 100644
--- a/chromium/chrome/browser/notifications/scheduler/public/BUILD.gn
+++ b/chromium/chrome/browser/notifications/scheduler/public/BUILD.gn
@@ -8,6 +8,8 @@ if (is_android) {
 
 source_set("public") {
   sources = [
+    "client_overview.cc",
+    "client_overview.h",
     "display_agent.cc",
     "display_agent.h",
     "features.cc",
@@ -30,6 +32,8 @@ source_set("public") {
     "notification_scheduler_types.h",
     "schedule_params.cc",
     "schedule_params.h",
+    "schedule_service_utils.cc",
+    "schedule_service_utils.h",
     "user_action_handler.h",
   ]
 
@@ -47,3 +51,17 @@ if (is_android) {
     ]
   }
 }
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "schedule_service_utils_unittest.cc",
+  ]
+
+  deps = [
+    "//chrome/browser/notifications/scheduler/public",
+    "//chrome/browser/notifications/scheduler/test:test_lib",
+    "//chrome/browser/notifications/scheduler/test:test_support",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/chrome/browser/notifications/scheduler/test/BUILD.gn b/chromium/chrome/browser/notifications/scheduler/test/BUILD.gn
index 28d6a8d0a39..183b609d283 100644
--- a/chromium/chrome/browser/notifications/scheduler/test/BUILD.gn
+++ b/chromium/chrome/browser/notifications/scheduler/test/BUILD.gn
@@ -27,8 +27,10 @@ source_set("test_support") {
 # Test library that is used internally and can't be exposed to the embedder.
 source_set("test_lib") {
   testonly = true
-  visibility =
-      [ "//chrome/browser/notifications/scheduler/internal:unit_tests" ]
+  visibility = [
+    "//chrome/browser/notifications/scheduler/internal:unit_tests",
+    "//chrome/browser/notifications/scheduler/public:unit_tests",
+  ]
 
   sources = [
     "fake_clock.cc",