BASELINE: Update Chromium to 85.0.4183.14085-based

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

2 files changed, 8 insertions, 8 deletions

diff --git a/chromium/chrome/common/extensions/manifest_handlers/linked_app_icons.cc b/chromium/chrome/common/extensions/manifest_handlers/linked_app_icons.cc
index 79a6f4e5148..effeaec82b0 100644
--- a/chromium/chrome/common/extensions/manifest_handlers/linked_app_icons.cc
+++ b/chromium/chrome/common/extensions/manifest_handlers/linked_app_icons.cc
@@ -24,19 +24,17 @@ static base::LazyInstance<LinkedAppIcons>::DestructorAtExit
 
 }  // namespace
 
-LinkedAppIcons::IconInfo::IconInfo() {
-}
+constexpr int LinkedAppIcons::kAnySize;
 
-LinkedAppIcons::IconInfo::~IconInfo() {
-}
+LinkedAppIcons::IconInfo::IconInfo() = default;
 
-LinkedAppIcons::LinkedAppIcons() {
-}
+LinkedAppIcons::IconInfo::~IconInfo() = default;
+
+LinkedAppIcons::LinkedAppIcons() = default;
 
 LinkedAppIcons::LinkedAppIcons(const LinkedAppIcons& other) = default;
 
-LinkedAppIcons::~LinkedAppIcons() {
-}
+LinkedAppIcons::~LinkedAppIcons() = default;
 
 // static
 const LinkedAppIcons& LinkedAppIcons::GetLinkedAppIcons(
diff --git a/chromium/chrome/common/extensions/manifest_handlers/linked_app_icons.h b/chromium/chrome/common/extensions/manifest_handlers/linked_app_icons.h
index 32845384e44..82f06970332 100644
--- a/chromium/chrome/common/extensions/manifest_handlers/linked_app_icons.h
+++ b/chromium/chrome/common/extensions/manifest_handlers/linked_app_icons.h
@@ -15,6 +15,8 @@ namespace extensions {
 
 // A structure to hold the parsed linked app icon data.
 struct LinkedAppIcons : public Extension::ManifestData {
+  static constexpr int kAnySize = 0;
+
   struct IconInfo {
     IconInfo();
     ~IconInfo();