BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

6 files changed, 10 insertions, 6 deletions

diff --git a/chromium/ui/message_center/public/mojo/BUILD.gn b/chromium/ui/message_center/public/mojo/BUILD.gn
index 59d1d2bf31f..8fedfa400f5 100644
--- a/chromium/ui/message_center/public/mojo/BUILD.gn
+++ b/chromium/ui/message_center/public/mojo/BUILD.gn
@@ -11,7 +11,6 @@ mojom("mojo") {
   ]
 
   public_deps = [
-    "//mojo/common:common_custom_types",
     "//mojo/public/mojom/base",
     "//ui/gfx/image/mojo:interfaces",
     "//url/mojom:url_mojom_gurl",
@@ -40,7 +39,6 @@ source_set("struct_traits") {
   public_deps = [
     ":mojo_shared_cpp_sources",
     "//base",
-    "//mojo/common:common_custom_types",
     "//mojo/public/cpp/bindings",
     "//ui/gfx",
     "//ui/gfx/image/mojo:struct_traits",
diff --git a/chromium/ui/message_center/public/mojo/DEPS b/chromium/ui/message_center/public/mojo/DEPS
deleted file mode 100644
index 6cfa565faca..00000000000
--- a/chromium/ui/message_center/public/mojo/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+mojo/common",
-]
diff --git a/chromium/ui/message_center/public/mojo/notification.mojom b/chromium/ui/message_center/public/mojo/notification.mojom
index 823517c3a43..5edb43011bf 100644
--- a/chromium/ui/message_center/public/mojo/notification.mojom
+++ b/chromium/ui/message_center/public/mojo/notification.mojom
@@ -62,7 +62,7 @@ struct RichNotificationData {
   bool should_make_spoken_feedback_for_popup_updates;
   bool pinned;
   // |vibration_pattern| intentionally omitted
-  // |renotify| intentionally omitted
+  bool renotify;
   // |silent| intentionally omitted
   mojo_base.mojom.String16 accessible_name;
   string vector_small_image_id;
diff --git a/chromium/ui/message_center/public/mojo/notification_struct_traits.cc b/chromium/ui/message_center/public/mojo/notification_struct_traits.cc
index 0a51cb6fa9d..3be58461182 100644
--- a/chromium/ui/message_center/public/mojo/notification_struct_traits.cc
+++ b/chromium/ui/message_center/public/mojo/notification_struct_traits.cc
@@ -117,6 +117,11 @@ bool RichNotificationDataStructTraits::pinned(const RichNotificationData& r) {
 }
 
 // static
+bool RichNotificationDataStructTraits::renotify(const RichNotificationData& r) {
+  return r.renotify;
+}
+
+// static
 const base::string16& RichNotificationDataStructTraits::accessible_name(
     const RichNotificationData& r) {
   return r.accessible_name;
@@ -166,6 +171,7 @@ bool RichNotificationDataStructTraits::Read(RichNotificationDataDataView data,
   out->should_make_spoken_feedback_for_popup_updates =
       data.should_make_spoken_feedback_for_popup_updates();
   out->pinned = data.pinned();
+  out->renotify = data.renotify();
 
   // Look up the vector icon by ID. This will only work if RegisterVectorIcon
   // has been called with an appropriate icon.
diff --git a/chromium/ui/message_center/public/mojo/notification_struct_traits.h b/chromium/ui/message_center/public/mojo/notification_struct_traits.h
index 4c35d5f716e..e2c68cbbab8 100644
--- a/chromium/ui/message_center/public/mojo/notification_struct_traits.h
+++ b/chromium/ui/message_center/public/mojo/notification_struct_traits.h
@@ -176,6 +176,7 @@ struct StructTraits<message_center::mojom::RichNotificationDataDataView,
   static bool should_make_spoken_feedback_for_popup_updates(
       const message_center::RichNotificationData& r);
   static bool pinned(const message_center::RichNotificationData& r);
+  static bool renotify(const message_center::RichNotificationData& r);
   static const base::string16& accessible_name(
       const message_center::RichNotificationData& r);
   static std::string vector_small_image_id(
diff --git a/chromium/ui/message_center/public/mojo/struct_traits_unittest.cc b/chromium/ui/message_center/public/mojo/struct_traits_unittest.cc
index 39e8dcae9c2..faefc694c95 100644
--- a/chromium/ui/message_center/public/mojo/struct_traits_unittest.cc
+++ b/chromium/ui/message_center/public/mojo/struct_traits_unittest.cc
@@ -49,6 +49,8 @@ class StructTraitsTest : public testing::Test, public mojom::TraitsTestService {
                   .should_make_spoken_feedback_for_popup_updates,
               output.rich_notification_data()
                   .should_make_spoken_feedback_for_popup_updates);
+    EXPECT_EQ(input.pinned(), output.pinned());
+    EXPECT_EQ(input.renotify(), output.renotify());
     EXPECT_EQ(input.accessible_name(), output.accessible_name());
     EXPECT_EQ(input.accent_color(), output.accent_color());
     EXPECT_EQ(input.should_show_settings_button(),