Adaptations for Chromium 74

Change-Id: Icdefa05eec39c632328dfc40862e5b734170bf3f
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

5 files changed, 32 insertions, 28 deletions

diff --git a/src/core/extensions/component_extension_resource_manager_qt.cpp b/src/core/extensions/component_extension_resource_manager_qt.cpp
index 57e35c231..09311c764 100644
--- a/src/core/extensions/component_extension_resource_manager_qt.cpp
+++ b/src/core/extensions/component_extension_resource_manager_qt.cpp
@@ -60,7 +60,7 @@ ComponentExtensionResourceManagerQt::~ComponentExtensionResourceManagerQt() {}
 
 bool ComponentExtensionResourceManagerQt::IsComponentExtensionResource(const base::FilePath &extension_path,
                                                                        const base::FilePath &resource_path,
-                                                                       int *resource_id) const
+                                                                       ComponentExtensionResourceInfo* resource_info) const
 {
     base::FilePath directory_path = extension_path;
     base::FilePath resources_dir;
@@ -73,11 +73,13 @@ bool ComponentExtensionResourceManagerQt::IsComponentExtensionResource(const bas
     relative_path = relative_path.Append(resource_path);
     relative_path = relative_path.NormalizePathSeparators();
 
-    std::map<base::FilePath, int>::const_iterator entry = path_to_resource_id_.find(relative_path);
-    if (entry != path_to_resource_id_.end())
-        *resource_id = entry->second;
+    auto entry = path_to_resource_info_.find(relative_path);
+    if (entry != path_to_resource_info_.end()) {
+        *resource_info = entry->second;
+        return true;
+    }
 
-    return entry != path_to_resource_id_.end();
+    return false;
 }
 
 const ui::TemplateReplacements *ComponentExtensionResourceManagerQt::GetTemplateReplacementsForExtension(const std::string &) const
@@ -85,14 +87,15 @@ const ui::TemplateReplacements *ComponentExtensionResourceManagerQt::GetTemplate
     return nullptr;
 }
 
-void ComponentExtensionResourceManagerQt::AddComponentResourceEntries(const GritResourceMap *entries, size_t size)
+void ComponentExtensionResourceManagerQt::AddComponentResourceEntries(const GzippedGritResourceMap *entries, size_t size)
 {
     for (size_t i = 0; i < size; ++i) {
         base::FilePath resource_path = base::FilePath().AppendASCII(entries[i].name);
         resource_path = resource_path.NormalizePathSeparators();
 
-        DCHECK(path_to_resource_id_.find(resource_path) == path_to_resource_id_.end());
-        path_to_resource_id_[resource_path] = entries[i].value;
+        DCHECK(!base::ContainsKey(path_to_resource_info_, resource_path));
+        path_to_resource_info_[resource_path] = { entries[i].value,
+                                                  entries[i].gzipped };
     }
 }
 
diff --git a/src/core/extensions/component_extension_resource_manager_qt.h b/src/core/extensions/component_extension_resource_manager_qt.h
index 2d858630f..c44c23439 100644
--- a/src/core/extensions/component_extension_resource_manager_qt.h
+++ b/src/core/extensions/component_extension_resource_manager_qt.h
@@ -49,7 +49,7 @@
 #include "base/files/file_path.h"
 #include "extensions/browser/component_extension_resource_manager.h"
 
-struct GritResourceMap;
+struct GzippedGritResourceMap;
 
 namespace extensions {
 
@@ -62,15 +62,15 @@ public:
     // Overridden from ComponentExtensionResourceManager:
     bool IsComponentExtensionResource(const base::FilePath &extension_path,
                                       const base::FilePath &resource_path,
-                                      int *resource_id) const override;
+                                      ComponentExtensionResourceInfo *resource_info) const override;
     const ui::TemplateReplacements *GetTemplateReplacementsForExtension(const std::string& extension_id) const override;
 
 private:
-    void AddComponentResourceEntries(const GritResourceMap* entries, size_t size);
+    void AddComponentResourceEntries(const GzippedGritResourceMap* entries, size_t size);
 
     // A map from a resource path to the resource ID.  Used by
     // IsComponentExtensionResource.
-    std::map<base::FilePath, int> path_to_resource_id_;
+    std::map<base::FilePath, ComponentExtensionResourceInfo> path_to_resource_info_;
 
     DISALLOW_COPY_AND_ASSIGN(ComponentExtensionResourceManagerQt);
 };
diff --git a/src/core/extensions/extension_web_contents_observer_qt.h b/src/core/extensions/extension_web_contents_observer_qt.h
index 267a1095c..5f32562fc 100644
--- a/src/core/extensions/extension_web_contents_observer_qt.h
+++ b/src/core/extensions/extension_web_contents_observer_qt.h
@@ -67,7 +67,7 @@ public:
 
 private:
     friend class content::WebContentsUserData<ExtensionWebContentsObserverQt>;
-    WEB_CONTENTS_USER_DATA_KEY_DECL()
+    WEB_CONTENTS_USER_DATA_KEY_DECL();
     DISALLOW_COPY_AND_ASSIGN(ExtensionWebContentsObserverQt);
 };
 
diff --git a/src/core/extensions/extensions_browser_client_qt.cpp b/src/core/extensions/extensions_browser_client_qt.cpp
index 8bba4128f..fc1def3ca 100644
--- a/src/core/extensions/extensions_browser_client_qt.cpp
+++ b/src/core/extensions/extensions_browser_client_qt.cpp
@@ -69,6 +69,7 @@
 #include "net/base/completion_once_callback.h"
 #include "net/base/mime_util.h"
 #include "net/url_request/url_request_simple_job.h"
+#include "services/network/public/mojom/url_loader.mojom.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #include "component_extension_resource_manager_qt.h"
@@ -108,12 +109,12 @@ public:
     URLRequestResourceBundleJob(net::URLRequest *request,
                                 net::NetworkDelegate *network_delegate,
                                 const base::FilePath &filename,
-                                int resource_id,
+                                const extensions::ComponentExtensionResourceInfo &resource_info,
                                 const std::string &content_security_policy,
                                 bool send_cors_header)
             : net::URLRequestSimpleJob(request, network_delegate)
             , filename_(filename)
-            , resource_id_(resource_id)
+            , resource_info_(resource_info)
             , weak_factory_(this)
     {
         // Leave cache headers out of resource bundle requests.
@@ -125,7 +126,7 @@ public:
                           net::CompletionOnceCallback callback) const override
     {
         const ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-        *data = rb.LoadDataResourceBytes(resource_id_);
+        *data = rb.LoadDataResourceBytes(resource_info_.resource_id);
 
         // Add the Content-Length header now that we know the resource length.
         response_info_.headers->AddHeader(
@@ -171,8 +172,8 @@ private:
     // We need the filename of the resource to determine the mime type.
     base::FilePath filename_;
 
-    // The resource bundle id to load.
-    int resource_id_;
+    // The resource to load.
+    const extensions::ComponentExtensionResourceInfo resource_info_;
 
     net::HttpResponseInfo response_info_;
 
@@ -266,14 +267,14 @@ net::URLRequestJob *ExtensionsBrowserClientQt::MaybeCreateResourceBundleRequestJ
             // extension relative path against resources_path.
             resources_path.AppendRelativePath(directory_path, &relative_path)) {
         base::FilePath request_path = extensions::file_util::ExtensionURLToRelativeFilePath(request->url());
-        int resource_id = 0;
-        if (GetComponentExtensionResourceManager()->IsComponentExtensionResource(directory_path, request_path, &resource_id)) {
+        ComponentExtensionResourceInfo resource_info;
+        if (GetComponentExtensionResourceManager()->IsComponentExtensionResource(directory_path, request_path, &resource_info)) {
             relative_path = relative_path.Append(request_path);
             relative_path = relative_path.NormalizePathSeparators();
             return new URLRequestResourceBundleJob(request,
                                                    network_delegate,
                                                    relative_path,
-                                                   resource_id,
+                                                   resource_info,
                                                    content_security_policy,
                                                    send_cors_header);
         }
@@ -284,9 +285,9 @@ net::URLRequestJob *ExtensionsBrowserClientQt::MaybeCreateResourceBundleRequestJ
 // Return the resource relative path and id for the given request.
 base::FilePath ExtensionsBrowserClientQt::GetBundleResourcePath(const network::ResourceRequest &request,
                                                                 const base::FilePath &extension_resources_path,
-                                                                int *resource_id) const
+                                                                ComponentExtensionResourceInfo *resource_info) const
 {
-    *resource_id = 0;
+    *resource_info = {};
     // |chrome_resources_path| corresponds to src/chrome/browser/resources in
     // source tree.
     base::FilePath resources_path;
@@ -303,10 +304,10 @@ base::FilePath ExtensionsBrowserClientQt::GetBundleResourcePath(const network::R
     const base::FilePath request_relative_path =
             extensions::file_util::ExtensionURLToRelativeFilePath(request.url);
     if (!ExtensionsBrowserClient::Get()->GetComponentExtensionResourceManager()->IsComponentExtensionResource(
-                extension_resources_path, request_relative_path, resource_id)) {
+                extension_resources_path, request_relative_path, resource_info)) {
         return base::FilePath();
     }
-    DCHECK_NE(0, *resource_id);
+    DCHECK_NE(0, resource_info->resource_id);
 
     return request_relative_path;
 }
@@ -316,7 +317,7 @@ base::FilePath ExtensionsBrowserClientQt::GetBundleResourcePath(const network::R
 void ExtensionsBrowserClientQt::LoadResourceFromResourceBundle(const network::ResourceRequest &request,
                                                                network::mojom::URLLoaderRequest loader,
                                                                const base::FilePath &resource_relative_path,
-                                                               int resource_id,
+                                                               const ComponentExtensionResourceInfo &resource_info,
                                                                const std::string &content_security_policy,
                                                                network::mojom::URLLoaderClientPtr client,
                                                                bool send_cors_header)
diff --git a/src/core/extensions/extensions_browser_client_qt.h b/src/core/extensions/extensions_browser_client_qt.h
index f766b96a7..aa478461f 100644
--- a/src/core/extensions/extensions_browser_client_qt.h
+++ b/src/core/extensions/extensions_browser_client_qt.h
@@ -124,14 +124,14 @@ public:
     // Return the resource relative path and id for the given request.
     base::FilePath GetBundleResourcePath(const network::ResourceRequest &request,
                                          const base::FilePath &extension_resources_path,
-                                         int *resource_id) const override;
+                                         ComponentExtensionResourceInfo *resource_info) const override;
 
     // Creates and starts a URLLoader to load an extension resource from the
     // embedder's resource bundle (.pak) files. Used for component extensions.
     void LoadResourceFromResourceBundle(const network::ResourceRequest &request,
                                         network::mojom::URLLoaderRequest loader,
                                         const base::FilePath &resource_relative_path,
-                                        int resource_id,
+                                        const ComponentExtensionResourceInfo& resource_info,
                                         const std::string &content_security_policy,
                                         network::mojom::URLLoaderClientPtr client,
                                         bool send_cors_header) override;