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, 5 deletions

diff --git a/chromium/extensions/common/extension_resource.h b/chromium/extensions/common/extension_resource.h
index 43281cc87cb..1ed42a1788a 100644
--- a/chromium/extensions/common/extension_resource.h
+++ b/chromium/extensions/common/extension_resource.h
@@ -11,10 +11,11 @@
 
 namespace extensions {
 
-// Represents a resource inside an extension. For example, an image, or a
-// JavaScript file. This is more complicated than just a simple FilePath
-// because extension resources can come from multiple physical file locations
-// depending on locale.
+// Represents a resource inside an extension. Hence a resource pointing to the
+// root extension directory isn't a valid ExtensionResource.
+// Examples include an image, or a JavaScript file. This is more complicated
+// than just a simple FilePath because extension resources can come from
+// multiple physical file locations depending on locale.
 class ExtensionResource {
  public:
   // SymlinkPolicy decides whether we'll allow resources to be a symlink to
@@ -58,10 +59,14 @@ class ExtensionResource {
 
   // Getters
   const std::string& extension_id() const { return extension_id_; }
+
+  // Note that this might be empty for a valid ExtensionResource since dummy
+  // Extension objects may be created with an empty extension root path in code.
   const base::FilePath& extension_root() const { return extension_root_; }
+
   const base::FilePath& relative_path() const { return relative_path_; }
 
-  bool empty() const { return extension_root().empty(); }
+  bool empty() const { return relative_path().empty(); }
 
   // Unit test helpers.
   base::FilePath::StringType NormalizeSeperators(