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>

4 files changed, 13 insertions, 12 deletions

diff --git a/chromium/third_party/blink/renderer/modules/battery/battery_manager.cc b/chromium/third_party/blink/renderer/modules/battery/battery_manager.cc
index 7f4e94f96ce..b47d0a6f5e5 100644
--- a/chromium/third_party/blink/renderer/modules/battery/battery_manager.cc
+++ b/chromium/third_party/blink/renderer/modules/battery/battery_manager.cc
@@ -74,13 +74,13 @@ void BatteryManager::DidUpdateData() {
     return;
 
   if (battery_status_.Charging() != old_status.Charging())
-    DispatchEvent(*Event::Create(EventTypeNames::chargingchange));
+    DispatchEvent(*Event::Create(event_type_names::kChargingchange));
   if (battery_status_.charging_time() != old_status.charging_time())
-    DispatchEvent(*Event::Create(EventTypeNames::chargingtimechange));
+    DispatchEvent(*Event::Create(event_type_names::kChargingtimechange));
   if (battery_status_.discharging_time() != old_status.discharging_time())
-    DispatchEvent(*Event::Create(EventTypeNames::dischargingtimechange));
+    DispatchEvent(*Event::Create(event_type_names::kDischargingtimechange));
   if (battery_status_.Level() != old_status.Level())
-    DispatchEvent(*Event::Create(EventTypeNames::levelchange));
+    DispatchEvent(*Event::Create(event_type_names::kLevelchange));
 }
 
 void BatteryManager::RegisterWithDispatcher() {
diff --git a/chromium/third_party/blink/renderer/modules/battery/battery_manager.h b/chromium/third_party/blink/renderer/modules/battery/battery_manager.h
index 478606eb068..93b1acfaf6f 100644
--- a/chromium/third_party/blink/renderer/modules/battery/battery_manager.h
+++ b/chromium/third_party/blink/renderer/modules/battery/battery_manager.h
@@ -33,7 +33,7 @@ class BatteryManager final : public EventTargetWithInlineData,
 
   // EventTarget implementation.
   const WTF::AtomicString& InterfaceName() const override {
-    return EventTargetNames::BatteryManager;
+    return event_target_names::kBatteryManager;
   }
   ExecutionContext* GetExecutionContext() const override {
     return ContextLifecycleObserver::GetExecutionContext();
@@ -44,10 +44,11 @@ class BatteryManager final : public EventTargetWithInlineData,
   double dischargingTime();
   double level();
 
-  DEFINE_ATTRIBUTE_EVENT_LISTENER(chargingchange);
-  DEFINE_ATTRIBUTE_EVENT_LISTENER(chargingtimechange);
-  DEFINE_ATTRIBUTE_EVENT_LISTENER(dischargingtimechange);
-  DEFINE_ATTRIBUTE_EVENT_LISTENER(levelchange);
+  DEFINE_ATTRIBUTE_EVENT_LISTENER(chargingchange, kChargingchange);
+  DEFINE_ATTRIBUTE_EVENT_LISTENER(chargingtimechange, kChargingtimechange);
+  DEFINE_ATTRIBUTE_EVENT_LISTENER(dischargingtimechange,
+                                  kDischargingtimechange);
+  DEFINE_ATTRIBUTE_EVENT_LISTENER(levelchange, kLevelchange);
 
   // Inherited from PlatformEventController.
   void DidUpdateData() override;
diff --git a/chromium/third_party/blink/renderer/modules/battery/navigator_battery.cc b/chromium/third_party/blink/renderer/modules/battery/navigator_battery.cc
index 3a80ad95c17..5825ea62e74 100644
--- a/chromium/third_party/blink/renderer/modules/battery/navigator_battery.cc
+++ b/chromium/third_party/blink/renderer/modules/battery/navigator_battery.cc
@@ -46,7 +46,7 @@ NavigatorBattery& NavigatorBattery::From(Navigator& navigator) {
   NavigatorBattery* supplement =
       Supplement<Navigator>::From<NavigatorBattery>(navigator);
   if (!supplement) {
-    supplement = new NavigatorBattery(navigator);
+    supplement = MakeGarbageCollected<NavigatorBattery>(navigator);
     ProvideTo(navigator, supplement);
   }
   return *supplement;
diff --git a/chromium/third_party/blink/renderer/modules/battery/navigator_battery.h b/chromium/third_party/blink/renderer/modules/battery/navigator_battery.h
index c72858412d5..e8aa9027444 100644
--- a/chromium/third_party/blink/renderer/modules/battery/navigator_battery.h
+++ b/chromium/third_party/blink/renderer/modules/battery/navigator_battery.h
@@ -27,11 +27,11 @@ class NavigatorBattery final : public GarbageCollected<NavigatorBattery>,
   static ScriptPromise getBattery(ScriptState*, Navigator&);
   ScriptPromise getBattery(ScriptState*);
 
+  explicit NavigatorBattery(Navigator&);
+
   void Trace(blink::Visitor*) override;
 
  private:
-  explicit NavigatorBattery(Navigator&);
-
   Member<BatteryManager> battery_manager_;
 };