Adaptations for Chromium 77

Fixes: QTBUG-77267
Change-Id: I181e24cf80ebee6991b95dde6c636f0d169b40a4
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

3 files changed, 4 insertions, 9 deletions

diff --git a/src/core/extensions/component_extension_resource_manager_qt.cpp b/src/core/extensions/component_extension_resource_manager_qt.cpp
index f83fcc51c..bb1dd045c 100644
--- a/src/core/extensions/component_extension_resource_manager_qt.cpp
+++ b/src/core/extensions/component_extension_resource_manager_qt.cpp
@@ -96,7 +96,7 @@ void ComponentExtensionResourceManagerQt::AddComponentResourceEntries(const Grit
         base::FilePath resource_path = base::FilePath().AppendASCII(entries[i].name);
         resource_path = resource_path.NormalizePathSeparators();
 
-        DCHECK(!base::ContainsKey(path_to_resource_id_, resource_path));
+        DCHECK(!base::Contains(path_to_resource_id_, resource_path));
         path_to_resource_id_[resource_path] = entries[i].value;
     }
 }
diff --git a/src/core/extensions/extension_system_qt.cpp b/src/core/extensions/extension_system_qt.cpp
index 4ca407421..7278e50c1 100644
--- a/src/core/extensions/extension_system_qt.cpp
+++ b/src/core/extensions/extension_system_qt.cpp
@@ -137,8 +137,9 @@ class ContentVerifierDelegateQt
 
   // This should return what verification mode is appropriate for the given
   // extension, if any.
-    Mode ShouldBeVerified(const Extension& extension) override {
-        return NONE;
+    bool ShouldBeVerified(const Extension& extension) override
+    {
+        return false;
     }
 
   // Should return the public key to use for validating signatures via the two
@@ -398,11 +399,6 @@ void ExtensionSystemQt::InitForRegularProfile(bool extensions_enabled)
     Init(extensions_enabled);
 }
 
-void ExtensionSystemQt::InitForIncognitoProfile()
-{
-    NOTIMPLEMENTED();
-}
-
 std::unique_ptr<ExtensionSet> ExtensionSystemQt::GetDependentExtensions(const Extension *extension)
 {
     return base::WrapUnique(new ExtensionSet());
diff --git a/src/core/extensions/extension_system_qt.h b/src/core/extensions/extension_system_qt.h
index 712e0104d..4370f5cc3 100644
--- a/src/core/extensions/extension_system_qt.h
+++ b/src/core/extensions/extension_system_qt.h
@@ -85,7 +85,6 @@ public:
 
     // ExtensionSystem implementation:
     void InitForRegularProfile(bool extensions_enabled) override;
-    void InitForIncognitoProfile() override;
     ExtensionService *extension_service() override;
     RuntimeData *runtime_data() override;
     ManagementPolicy *management_policy() override;