BASELINE: Update Chromium to 85.0.4183.14085-based

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

12 files changed, 38 insertions, 52 deletions

diff --git a/chromium/ui/base/accelerators/accelerator.cc b/chromium/ui/base/accelerators/accelerator.cc
index 2ab364badbe..7f26ef86fe9 100644
--- a/chromium/ui/base/accelerators/accelerator.cc
+++ b/chromium/ui/base/accelerators/accelerator.cc
@@ -135,17 +135,11 @@ Accelerator::Accelerator(const KeyEvent& key_event)
 #endif
 }
 
-Accelerator::Accelerator(const Accelerator& accelerator) {
-  key_code_ = accelerator.key_code_;
-  key_state_ = accelerator.key_state_;
-  modifiers_ = accelerator.modifiers_;
-  time_stamp_ = accelerator.time_stamp_;
-  interrupted_by_mouse_event_ = accelerator.interrupted_by_mouse_event_;
-  source_device_id_ = accelerator.source_device_id_;
-}
+Accelerator::Accelerator(const Accelerator& accelerator) = default;
 
-Accelerator::~Accelerator() {
-}
+Accelerator& Accelerator::operator=(const Accelerator& accelerator) = default;
+
+Accelerator::~Accelerator() = default;
 
 // static
 int Accelerator::MaskOutKeyEventFlags(int flags) {
@@ -159,17 +153,6 @@ KeyEvent Accelerator::ToKeyEvent() const {
                   key_code(), modifiers(), time_stamp());
 }
 
-Accelerator& Accelerator::operator=(const Accelerator& accelerator) {
-  if (this != &accelerator) {
-    key_code_ = accelerator.key_code_;
-    key_state_ = accelerator.key_state_;
-    modifiers_ = accelerator.modifiers_;
-    time_stamp_ = accelerator.time_stamp_;
-    interrupted_by_mouse_event_ = accelerator.interrupted_by_mouse_event_;
-  }
-  return *this;
-}
-
 bool Accelerator::operator <(const Accelerator& rhs) const {
   const int modifiers_with_mask = MaskOutKeyEventFlags(modifiers_);
   const int rhs_modifiers_with_mask = MaskOutKeyEventFlags(rhs.modifiers_);
diff --git a/chromium/ui/base/accelerators/accelerator.h b/chromium/ui/base/accelerators/accelerator.h
index d4b97e5b6ee..6111a3bf550 100644
--- a/chromium/ui/base/accelerators/accelerator.h
+++ b/chromium/ui/base/accelerators/accelerator.h
@@ -14,10 +14,10 @@
 #include <memory>
 #include <utility>
 
+#include "base/component_export.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
-#include "ui/base/ui_base_export.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
@@ -30,7 +30,7 @@ class KeyEvent;
 // for a particular KeyEvent matches an accelerator with or without the repeat
 // flag. A side effect of this is that == (and <) does not consider the
 // repeat flag in its comparison.
-class UI_BASE_EXPORT Accelerator {
+class COMPONENT_EXPORT(UI_BASE) Accelerator {
  public:
   enum class KeyState {
     PRESSED,
@@ -48,6 +48,7 @@ class UI_BASE_EXPORT Accelerator {
               base::TimeTicks time_stamp = base::TimeTicks());
   explicit Accelerator(const KeyEvent& key_event);
   Accelerator(const Accelerator& accelerator);
+  Accelerator& operator=(const Accelerator& accelerator);
   ~Accelerator();
 
   // Masks out all the non-modifiers KeyEvent |flags| and returns only the
@@ -56,8 +57,6 @@ class UI_BASE_EXPORT Accelerator {
 
   KeyEvent ToKeyEvent() const;
 
-  Accelerator& operator=(const Accelerator& accelerator);
-
   // Define the < operator so that the KeyboardShortcut can be used as a key in
   // a std::map.
   bool operator <(const Accelerator& rhs) const;
@@ -129,7 +128,7 @@ class UI_BASE_EXPORT Accelerator {
 
 // An interface that classes that want to register for keyboard accelerators
 // should implement.
-class UI_BASE_EXPORT AcceleratorTarget {
+class COMPONENT_EXPORT(UI_BASE) AcceleratorTarget {
  public:
   // Should return true if the accelerator was processed.
   virtual bool AcceleratorPressed(const Accelerator& accelerator) = 0;
diff --git a/chromium/ui/base/accelerators/accelerator_history.h b/chromium/ui/base/accelerators/accelerator_history.h
index e9413773dbb..5d5ece78516 100644
--- a/chromium/ui/base/accelerators/accelerator_history.h
+++ b/chromium/ui/base/accelerators/accelerator_history.h
@@ -7,15 +7,15 @@
 
 #include <set>
 
+#include "base/component_export.h"
 #include "base/macros.h"
 #include "ui/base/accelerators/accelerator.h"
-#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
 // Keeps track of the system-wide current and the most recent previous
 // key accelerators.
-class UI_BASE_EXPORT AcceleratorHistory {
+class COMPONENT_EXPORT(UI_BASE) AcceleratorHistory {
  public:
   AcceleratorHistory();
   ~AcceleratorHistory();
diff --git a/chromium/ui/base/accelerators/accelerator_manager.h b/chromium/ui/base/accelerators/accelerator_manager.h
index 9eeec5ce99e..6d7c88604a0 100644
--- a/chromium/ui/base/accelerators/accelerator_manager.h
+++ b/chromium/ui/base/accelerators/accelerator_manager.h
@@ -10,16 +10,16 @@
 #include <utility>
 #include <vector>
 
+#include "base/component_export.h"
 #include "base/macros.h"
 #include "ui/base/accelerators/accelerator.h"
-#include "ui/base/ui_base_export.h"
 #include "ui/events/event_constants.h"
 
 namespace ui {
 
 // AcceleratorManger handles processing of accelerators. A delegate may be
 // supplied which is notified as unique accelerators are added and removed.
-class UI_BASE_EXPORT AcceleratorManager {
+class COMPONENT_EXPORT(UI_BASE) AcceleratorManager {
  public:
   enum HandlerPriority {
     kNormalPriority,
diff --git a/chromium/ui/base/accelerators/global_media_keys_listener_win.h b/chromium/ui/base/accelerators/global_media_keys_listener_win.h
index 8de4946c61c..2f20ba52397 100644
--- a/chromium/ui/base/accelerators/global_media_keys_listener_win.h
+++ b/chromium/ui/base/accelerators/global_media_keys_listener_win.h
@@ -5,10 +5,10 @@
 #ifndef UI_BASE_ACCELERATORS_GLOBAL_MEDIA_KEYS_LISTENER_WIN_H_
 #define UI_BASE_ACCELERATORS_GLOBAL_MEDIA_KEYS_LISTENER_WIN_H_
 
+#include "base/component_export.h"
 #include "base/containers/flat_map.h"
 #include "base/win/windows_types.h"
 #include "ui/base/accelerators/media_keys_listener.h"
-#include "ui/base/ui_base_export.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace gfx {
@@ -22,7 +22,8 @@ namespace ui {
 // Implementation of MediaKeysListener that uses RegisterHotKey to globally
 // listen for media key presses. It only allows for a single instance to be
 // created in order to prevent conflicts form multiple listeners.
-class UI_BASE_EXPORT GlobalMediaKeysListenerWin : public MediaKeysListener {
+class COMPONENT_EXPORT(UI_BASE) GlobalMediaKeysListenerWin
+    : public MediaKeysListener {
  public:
   explicit GlobalMediaKeysListenerWin(MediaKeysListener::Delegate* delegate);
   ~GlobalMediaKeysListenerWin() override;
diff --git a/chromium/ui/base/accelerators/media_keys_listener.h b/chromium/ui/base/accelerators/media_keys_listener.h
index 997718d8aff..6787fa39da1 100644
--- a/chromium/ui/base/accelerators/media_keys_listener.h
+++ b/chromium/ui/base/accelerators/media_keys_listener.h
@@ -8,8 +8,8 @@
 #include <memory>
 
 #include "base/callback.h"
+#include "base/component_export.h"
 #include "base/observer_list_types.h"
-#include "ui/base/ui_base_export.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ui {
@@ -17,7 +17,7 @@ namespace ui {
 class Accelerator;
 
 // Create MediaKeyListener to receive accelerators on media keys.
-class UI_BASE_EXPORT MediaKeysListener {
+class COMPONENT_EXPORT(UI_BASE) MediaKeysListener {
  public:
   enum class Scope {
     kGlobal,   // Listener works whenever application in focus or not.
@@ -25,7 +25,7 @@ class UI_BASE_EXPORT MediaKeysListener {
   };
 
   // Media keys accelerators receiver.
-  class UI_BASE_EXPORT Delegate : public base::CheckedObserver {
+  class COMPONENT_EXPORT(UI_BASE) Delegate : public base::CheckedObserver {
    public:
     ~Delegate() override;
 
diff --git a/chromium/ui/base/accelerators/media_keys_listener_mac.mm b/chromium/ui/base/accelerators/media_keys_listener_mac.mm
index 85378bb565d..6052fd13ff3 100644
--- a/chromium/ui/base/accelerators/media_keys_listener_mac.mm
+++ b/chromium/ui/base/accelerators/media_keys_listener_mac.mm
@@ -11,6 +11,7 @@
 #include <IOKit/hidsystem/ev_keymap.h>
 
 #include "base/containers/flat_set.h"
+#include "base/logging.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/system_media_controls_media_keys_listener.h"
 
diff --git a/chromium/ui/base/accelerators/media_keys_util.h b/chromium/ui/base/accelerators/media_keys_util.h
index 95a98d58598..029a9572f7f 100644
--- a/chromium/ui/base/accelerators/media_keys_util.h
+++ b/chromium/ui/base/accelerators/media_keys_util.h
@@ -5,7 +5,7 @@
 #ifndef UI_BASE_ACCELERATORS_MEDIA_KEYS_UTIL_H_
 #define UI_BASE_ACCELERATORS_MEDIA_KEYS_UTIL_H_
 
-#include "ui/base/ui_base_export.h"
+#include "base/component_export.h"
 
 namespace ui {
 
@@ -24,12 +24,13 @@ enum class MediaHardwareKeyAction {
 };
 
 // The name of the histogram that records |MediaHardwareKeyAction|.
-UI_BASE_EXPORT extern const char kMediaHardwareKeyActionHistogramName[];
+COMPONENT_EXPORT(UI_BASE)
+extern const char kMediaHardwareKeyActionHistogramName[];
 
 // Records a media hardware key action to the
 // |kMediaHardwareKeyActionHistogramName| histogram.
-UI_BASE_EXPORT void RecordMediaHardwareKeyAction(
-    ui::MediaHardwareKeyAction action);
+COMPONENT_EXPORT(UI_BASE)
+void RecordMediaHardwareKeyAction(ui::MediaHardwareKeyAction action);
 
 }  // namespace ui
 
diff --git a/chromium/ui/base/accelerators/menu_label_accelerator_util.h b/chromium/ui/base/accelerators/menu_label_accelerator_util.h
index d70b21b6a34..fcdcd206a09 100644
--- a/chromium/ui/base/accelerators/menu_label_accelerator_util.h
+++ b/chromium/ui/base/accelerators/menu_label_accelerator_util.h
@@ -7,17 +7,17 @@
 
 #include <string>
 
+#include "base/component_export.h"
 #include "base/strings/string16.h"
-#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
-UI_BASE_EXPORT base::char16 GetMnemonic(const base::string16& label);
+COMPONENT_EXPORT(UI_BASE) base::char16 GetMnemonic(const base::string16& label);
 
 // This function escapes every '&' in label by replacing it with '&&', to avoid
 // having single ampersands in user-provided strings treated as accelerators.
-UI_BASE_EXPORT base::string16 EscapeMenuLabelAmpersands(
-    const base::string16& label);
+COMPONENT_EXPORT(UI_BASE)
+base::string16 EscapeMenuLabelAmpersands(const base::string16& label);
 
 }  // namespace ui
 
diff --git a/chromium/ui/base/accelerators/menu_label_accelerator_util_linux.h b/chromium/ui/base/accelerators/menu_label_accelerator_util_linux.h
index 3d1c5d073f5..d799fb5ec28 100644
--- a/chromium/ui/base/accelerators/menu_label_accelerator_util_linux.h
+++ b/chromium/ui/base/accelerators/menu_label_accelerator_util_linux.h
@@ -7,18 +7,18 @@
 
 #include <string>
 
-#include "ui/base/ui_base_export.h"
+#include "base/component_export.h"
 
 namespace ui {
 
 // Change windows accelerator style to GTK style. (GTK uses _ for
 // accelerators.  Windows uses & with && as an escape for &.)
-UI_BASE_EXPORT std::string ConvertAcceleratorsFromWindowsStyle(
-    const std::string& label);
+COMPONENT_EXPORT(UI_BASE)
+std::string ConvertAcceleratorsFromWindowsStyle(const std::string& label);
 
 // Removes the "&" accelerators from a Windows label.
-UI_BASE_EXPORT std::string RemoveWindowsStyleAccelerators(
-    const std::string& label);
+COMPONENT_EXPORT(UI_BASE)
+std::string RemoveWindowsStyleAccelerators(const std::string& label);
 
 }  // namespace ui
 
diff --git a/chromium/ui/base/accelerators/platform_accelerator_cocoa.h b/chromium/ui/base/accelerators/platform_accelerator_cocoa.h
index 9feb15fab9a..26e93bd6f08 100644
--- a/chromium/ui/base/accelerators/platform_accelerator_cocoa.h
+++ b/chromium/ui/base/accelerators/platform_accelerator_cocoa.h
@@ -7,8 +7,8 @@
 
 #import <Foundation/Foundation.h>
 
+#include "base/component_export.h"
 #include "ui/base/accelerators/accelerator.h"
-#include "ui/base/ui_base_export.h"
 
 namespace ui {
 
@@ -19,7 +19,8 @@ namespace ui {
 // accelerators have an associated NSMenuItem. Each NSMenuItem is specified with
 // a |key_equivalent| and |modifier_mask|. This function takes a ui::Accelerator
 // and returns the associated |key_equivalent| and |modifier_mask|.
-UI_BASE_EXPORT void GetKeyEquivalentAndModifierMaskFromAccelerator(
+COMPONENT_EXPORT(UI_BASE)
+void GetKeyEquivalentAndModifierMaskFromAccelerator(
     const ui::Accelerator& accelerator,
     NSString** key_equivalent,
     NSUInteger* modifier_mask);
diff --git a/chromium/ui/base/accelerators/system_media_controls_media_keys_listener.h b/chromium/ui/base/accelerators/system_media_controls_media_keys_listener.h
index 2159509caa6..847669a515e 100644
--- a/chromium/ui/base/accelerators/system_media_controls_media_keys_listener.h
+++ b/chromium/ui/base/accelerators/system_media_controls_media_keys_listener.h
@@ -5,10 +5,10 @@
 #ifndef UI_BASE_ACCELERATORS_SYSTEM_MEDIA_CONTROLS_MEDIA_KEYS_LISTENER_H_
 #define UI_BASE_ACCELERATORS_SYSTEM_MEDIA_CONTROLS_MEDIA_KEYS_LISTENER_H_
 
+#include "base/component_export.h"
 #include "base/containers/flat_set.h"
 #include "components/system_media_controls/system_media_controls_observer.h"
 #include "ui/base/accelerators/media_keys_listener.h"
-#include "ui/base/ui_base_export.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace system_media_controls {
@@ -20,7 +20,7 @@ namespace ui {
 // Implementation of MediaKeysListener that uses the SystemMediaControls API to
 // listen for media key presses. It only allows for a single instance to be
 // created in order to prevent conflicts from multiple listeners.
-class UI_BASE_EXPORT SystemMediaControlsMediaKeysListener
+class COMPONENT_EXPORT(UI_BASE) SystemMediaControlsMediaKeysListener
     : public MediaKeysListener,
       public system_media_controls::SystemMediaControlsObserver {
  public: