Adaptations for Chromium 76

Change-Id: Id6d18a3854b572334dc1d65f1916b8991a740cd2
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

4 files changed, 32 insertions, 36 deletions

diff --git a/src/core/extensions/component_extension_resource_manager_qt.cpp b/src/core/extensions/component_extension_resource_manager_qt.cpp
index 09311c764..f83fcc51c 100644
--- a/src/core/extensions/component_extension_resource_manager_qt.cpp
+++ b/src/core/extensions/component_extension_resource_manager_qt.cpp
@@ -46,6 +46,9 @@
 
 #include "base/logging.h"
 #include "base/path_service.h"
+#include "base/stl_util.h"
+#include "base/values.h"
+
 #include "chrome/grit/component_extension_resources_map.h"
 
 namespace extensions {
@@ -60,7 +63,7 @@ ComponentExtensionResourceManagerQt::~ComponentExtensionResourceManagerQt() {}
 
 bool ComponentExtensionResourceManagerQt::IsComponentExtensionResource(const base::FilePath &extension_path,
                                                                        const base::FilePath &resource_path,
-                                                                       ComponentExtensionResourceInfo* resource_info) const
+                                                                       int *resource_id) const
 {
     base::FilePath directory_path = extension_path;
     base::FilePath resources_dir;
@@ -73,9 +76,9 @@ bool ComponentExtensionResourceManagerQt::IsComponentExtensionResource(const bas
     relative_path = relative_path.Append(resource_path);
     relative_path = relative_path.NormalizePathSeparators();
 
-    auto entry = path_to_resource_info_.find(relative_path);
-    if (entry != path_to_resource_info_.end()) {
-        *resource_info = entry->second;
+    auto entry = path_to_resource_id_.find(relative_path);
+    if (entry != path_to_resource_id_.end()) {
+        *resource_id = entry->second;
         return true;
     }
 
@@ -87,15 +90,14 @@ const ui::TemplateReplacements *ComponentExtensionResourceManagerQt::GetTemplate
     return nullptr;
 }
 
-void ComponentExtensionResourceManagerQt::AddComponentResourceEntries(const GzippedGritResourceMap *entries, size_t size)
+void ComponentExtensionResourceManagerQt::AddComponentResourceEntries(const GritResourceMap *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(!base::ContainsKey(path_to_resource_info_, resource_path));
-        path_to_resource_info_[resource_path] = { entries[i].value,
-                                                  entries[i].gzipped };
+        DCHECK(!base::ContainsKey(path_to_resource_id_, resource_path));
+        path_to_resource_id_[resource_path] = entries[i].value;
     }
 }
 
diff --git a/src/core/extensions/component_extension_resource_manager_qt.h b/src/core/extensions/component_extension_resource_manager_qt.h
index c44c23439..b719c8960 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 GzippedGritResourceMap;
+struct GritResourceMap;
 
 namespace extensions {
 
@@ -62,15 +62,15 @@ public:
     // Overridden from ComponentExtensionResourceManager:
     bool IsComponentExtensionResource(const base::FilePath &extension_path,
                                       const base::FilePath &resource_path,
-                                      ComponentExtensionResourceInfo *resource_info) const override;
-    const ui::TemplateReplacements *GetTemplateReplacementsForExtension(const std::string& extension_id) const override;
+                                      int *resource_id) const override;
+    const ui::TemplateReplacements *GetTemplateReplacementsForExtension(const std::string &extension_id) const override;
 
 private:
-    void AddComponentResourceEntries(const GzippedGritResourceMap* entries, size_t size);
+    void AddComponentResourceEntries(const GritResourceMap *entries, size_t size);
 
     // A map from a resource path to the resource ID.  Used by
     // IsComponentExtensionResource.
-    std::map<base::FilePath, ComponentExtensionResourceInfo> path_to_resource_info_;
+    std::map<base::FilePath, int> path_to_resource_id_;
 
     DISALLOW_COPY_AND_ASSIGN(ComponentExtensionResourceManagerQt);
 };
diff --git a/src/core/extensions/extensions_browser_client_qt.cpp b/src/core/extensions/extensions_browser_client_qt.cpp
index fc1def3ca..eb8c12bff 100644
--- a/src/core/extensions/extensions_browser_client_qt.cpp
+++ b/src/core/extensions/extensions_browser_client_qt.cpp
@@ -109,12 +109,12 @@ public:
     URLRequestResourceBundleJob(net::URLRequest *request,
                                 net::NetworkDelegate *network_delegate,
                                 const base::FilePath &filename,
-                                const extensions::ComponentExtensionResourceInfo &resource_info,
+                                int resource_id,
                                 const std::string &content_security_policy,
                                 bool send_cors_header)
             : net::URLRequestSimpleJob(request, network_delegate)
             , filename_(filename)
-            , resource_info_(resource_info)
+            , resource_id_(resource_id)
             , weak_factory_(this)
     {
         // Leave cache headers out of resource bundle requests.
@@ -126,7 +126,7 @@ public:
                           net::CompletionOnceCallback callback) const override
     {
         const ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-        *data = rb.LoadDataResourceBytes(resource_info_.resource_id);
+        *data = rb.LoadDataResourceBytes(resource_id_);
 
         // Add the Content-Length header now that we know the resource length.
         response_info_.headers->AddHeader(
@@ -173,7 +173,7 @@ private:
     base::FilePath filename_;
 
     // The resource to load.
-    const extensions::ComponentExtensionResourceInfo resource_info_;
+    int resource_id_;
 
     net::HttpResponseInfo response_info_;
 
@@ -267,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());
-        ComponentExtensionResourceInfo resource_info;
-        if (GetComponentExtensionResourceManager()->IsComponentExtensionResource(directory_path, request_path, &resource_info)) {
+        int resource_id = 0;
+        if (GetComponentExtensionResourceManager()->IsComponentExtensionResource(directory_path, request_path, &resource_id)) {
             relative_path = relative_path.Append(request_path);
             relative_path = relative_path.NormalizePathSeparators();
             return new URLRequestResourceBundleJob(request,
                                                    network_delegate,
                                                    relative_path,
-                                                   resource_info,
+                                                   resource_id,
                                                    content_security_policy,
                                                    send_cors_header);
         }
@@ -285,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,
-                                                                ComponentExtensionResourceInfo *resource_info) const
+                                                                int *resource_id) const
 {
-    *resource_info = {};
+    *resource_id = 0;
     // |chrome_resources_path| corresponds to src/chrome/browser/resources in
     // source tree.
     base::FilePath resources_path;
@@ -304,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_info)) {
+                extension_resources_path, request_relative_path, resource_id)) {
         return base::FilePath();
     }
-    DCHECK_NE(0, resource_info->resource_id);
+    DCHECK_NE(0, *resource_id);
 
     return request_relative_path;
 }
@@ -317,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,
-                                                               const ComponentExtensionResourceInfo &resource_info,
+                                                               int resource_id,
                                                                const std::string &content_security_policy,
                                                                network::mojom::URLLoaderClientPtr client,
                                                                bool send_cors_header)
@@ -356,7 +356,7 @@ PrefService *ExtensionsBrowserClientQt::GetPrefServiceForContext(BrowserContext
 }
 
 void ExtensionsBrowserClientQt::GetEarlyExtensionPrefsObservers(content::BrowserContext *context,
-                                                                std::vector<ExtensionPrefsObserver *> *observers) const
+                                                                std::vector<EarlyExtensionPrefsObserver *> *observers) const
 {
 }
 
@@ -432,11 +432,6 @@ void ExtensionsBrowserClientQt::BroadcastEventToRenderers(events::HistogramValue
     //     histogram_value, event_name, std::move(args), GURL());
 }
 
-net::NetLog *ExtensionsBrowserClientQt::GetNetLog()
-{
-    return nullptr;
-}
-
 ExtensionCache *ExtensionsBrowserClientQt::GetExtensionCache()
 {
     // Only used by Chrome via ExtensionService.
diff --git a/src/core/extensions/extensions_browser_client_qt.h b/src/core/extensions/extensions_browser_client_qt.h
index aa478461f..056e65c9e 100644
--- a/src/core/extensions/extensions_browser_client_qt.h
+++ b/src/core/extensions/extensions_browser_client_qt.h
@@ -87,8 +87,8 @@ public:
                                         const ExtensionSet &extensions,
                                         const ProcessMap &process_map) override;
     PrefService *GetPrefServiceForContext(content::BrowserContext *context) override;
-    void GetEarlyExtensionPrefsObservers(content::BrowserContext *context, std::vector<ExtensionPrefsObserver *> *observers) const
-            override;
+    void GetEarlyExtensionPrefsObservers(content::BrowserContext *context,
+                                         std::vector<EarlyExtensionPrefsObserver *> *observers) const override;
     ProcessManagerDelegate *GetProcessManagerDelegate() const override;
     std::unique_ptr<ExtensionHostDelegate>
     CreateExtensionHostDelegate() override;
@@ -107,7 +107,6 @@ public:
     void BroadcastEventToRenderers(events::HistogramValue histogram_value,
                                    const std::string &event_name,
                                    std::unique_ptr<base::ListValue> args) override;
-    net::NetLog *GetNetLog() override;
     ExtensionCache *GetExtensionCache() override;
     bool IsBackgroundUpdateAllowed() override;
     bool IsMinBrowserVersionSupported(const std::string &min_version) override;
@@ -124,14 +123,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,
-                                         ComponentExtensionResourceInfo *resource_info) const override;
+                                         int *resource_id) 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,
-                                        const ComponentExtensionResourceInfo& resource_info,
+                                        int resource_id,
                                         const std::string &content_security_policy,
                                         network::mojom::URLLoaderClientPtr client,
                                         bool send_cors_header) override;