BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 10 insertions, 3 deletions

diff --git a/chromium/extensions/browser/extension_action.h b/chromium/extensions/browser/extension_action.h
index c17ba49b897..646c00dfd31 100644
--- a/chromium/extensions/browser/extension_action.h
+++ b/chromium/extensions/browser/extension_action.h
@@ -42,6 +42,12 @@ class ExtensionAction {
     // the UI.
   };
 
+  enum class IconParseResult {
+    kSuccess,
+    kDecodeFailure,
+    kUnpickleFailure,
+  };
+
   static extension_misc::ExtensionIcons ActionIconSize();
 
   // Returns the default icon to use when no other is available (the puzzle
@@ -95,9 +101,10 @@ class ExtensionAction {
   void SetIcon(int tab_id, const gfx::Image& image);
 
   // Tries to parse |*icon| from a dictionary {"19": imageData19, "38":
-  // imageData38}, returning false if a value is corrupt.
-  static bool ParseIconFromCanvasDictionary(const base::DictionaryValue& dict,
-                                            gfx::ImageSkia* icon);
+  // imageData38}, and returns the result of the parsing attempt.
+  static IconParseResult ParseIconFromCanvasDictionary(
+      const base::DictionaryValue& dict,
+      gfx::ImageSkia* icon);
 
   // Gets the icon that has been set using |SetIcon| for the tab.
   gfx::Image GetExplicitlySetIcon(int tab_id) const;