BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0

Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

5 files changed, 33 insertions, 13 deletions

diff --git a/chromium/ppapi/cpp/BUILD.gn b/chromium/ppapi/cpp/BUILD.gn
index a5d692b8a56..da877e90889 100644
--- a/chromium/ppapi/cpp/BUILD.gn
+++ b/chromium/ppapi/cpp/BUILD.gn
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/jumbo.gni")
+
 if (is_nacl) {
   import("//build/config/nacl/config.gni")
 }
@@ -9,7 +11,7 @@ if (is_nacl) {
 if (is_nacl && is_nacl_glibc) {
   cpp_target_type = "shared_library"
 } else {
-  cpp_target_type = "static_library"
+  cpp_target_type = "jumbo_static_library"
 }
 
 # Link to this target to get the PPAPI C++ wrapper objects and plugin startup
@@ -50,7 +52,7 @@ target(cpp_target_type, "cpp") {
 # Link to this target to get only the PPAPI C++ wrapper objects but not the
 # plugin startup code. Some plugins need special startup code that they supply
 # themselves.
-source_set("objects") {
+jumbo_source_set("objects") {
   sources = [
     "array_output.cc",
     "array_output.h",
@@ -91,6 +93,7 @@ source_set("objects") {
     "image_data.h",
     "input_event.cc",
     "input_event.h",
+    "input_event_interface_name.h",
     "instance.cc",
     "instance.h",
     "instance_handle.cc",
diff --git a/chromium/ppapi/cpp/input_event.cc b/chromium/ppapi/cpp/input_event.cc
index 2bd3ec71c6b..044e33579c9 100644
--- a/chromium/ppapi/cpp/input_event.cc
+++ b/chromium/ppapi/cpp/input_event.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/cpp/input_event.h"
 
+#include "ppapi/cpp/input_event_interface_name.h"
 #include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
@@ -15,10 +16,6 @@ namespace pp {
 
 namespace {
 
-template <> const char* interface_name<PPB_InputEvent_1_0>() {
-  return PPB_INPUT_EVENT_INTERFACE_1_0;
-}
-
 template <> const char* interface_name<PPB_KeyboardInputEvent_1_2>() {
   return PPB_KEYBOARD_INPUT_EVENT_INTERFACE_1_2;
 }
diff --git a/chromium/ppapi/cpp/input_event_interface_name.h b/chromium/ppapi/cpp/input_event_interface_name.h
new file mode 100644
index 00000000000..8918fe6c305
--- /dev/null
+++ b/chromium/ppapi/cpp/input_event_interface_name.h
@@ -0,0 +1,24 @@
+// Copyright 2018 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.
+
+#ifndef PPAPI_CPP_INPUT_EVENT_INTERFACE_NAME_H_
+#define PPAPI_CPP_INPUT_EVENT_INTERFACE_NAME_H_
+
+#include "ppapi/c/ppb_input_event.h"
+#include "ppapi/cpp/module_impl.h"
+
+namespace pp {
+
+namespace {
+
+// This implementation is shared between instance.cc and input_event.cc
+template <>
+const char* interface_name<PPB_InputEvent_1_0>() {
+  return PPB_INPUT_EVENT_INTERFACE_1_0;
+}
+
+}  // namespace
+}  // namespace pp
+
+#endif  // PPAPI_CPP_INPUT_EVENT_INTERFACE_NAME_H_
diff --git a/chromium/ppapi/cpp/instance.cc b/chromium/ppapi/cpp/instance.cc
index 74b93216729..08c815571aa 100644
--- a/chromium/ppapi/cpp/instance.cc
+++ b/chromium/ppapi/cpp/instance.cc
@@ -14,6 +14,7 @@
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/graphics_3d.h"
 #include "ppapi/cpp/image_data.h"
+#include "ppapi/cpp/input_event_interface_name.h"
 #include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/logging.h"
 #include "ppapi/cpp/message_handler.h"
@@ -33,10 +34,6 @@ template <> const char* interface_name<PPB_Console_1_0>() {
   return PPB_CONSOLE_INTERFACE_1_0;
 }
 
-template <> const char* interface_name<PPB_InputEvent_1_0>() {
-  return PPB_INPUT_EVENT_INTERFACE_1_0;
-}
-
 template <> const char* interface_name<PPB_Instance_1_0>() {
   return PPB_INSTANCE_INTERFACE_1_0;
 }
diff --git a/chromium/ppapi/cpp/module_impl.h b/chromium/ppapi/cpp/module_impl.h
index fa2c61923be..28a6cf6364f 100644
--- a/chromium/ppapi/cpp/module_impl.h
+++ b/chromium/ppapi/cpp/module_impl.h
@@ -17,9 +17,8 @@ namespace {
 
 // Specialize this function to return the interface string corresponding to the
 // PP?_XXX structure.
-template <typename T> const char* interface_name() {
-  return NULL;
-}
+template <typename T>
+const char* interface_name();
 
 template <typename T> inline T const* get_interface() {
   static T const* funcs = reinterpret_cast<T const*>(