Merge remote-tracking branch 'origin/5.15' into dev

Including update to 87-based

Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6

4 files changed, 33 insertions, 14 deletions

diff --git a/src/core/common/extensions/api/qtwebengine_extensions_features.gni b/src/core/common/extensions/api/qtwebengine_extensions_features.gni
index ed7e713c6..3873e235a 100644
--- a/src/core/common/extensions/api/qtwebengine_extensions_features.gni
+++ b/src/core/common/extensions/api/qtwebengine_extensions_features.gni
@@ -12,7 +12,8 @@ json_features("qt_permission_features") {
   feature_type = "PermissionFeature"
   method_name = "AddQtPermissionFeatures"
   sources = [
-    "//extensions/common/api/_permission_features.json"
+    "//chrome/common/extensions/api/_permission_features.json",
+    "//extensions/common/api/_permission_features.json",
   ]
 }
 
@@ -20,6 +21,7 @@ group("qtwebengine_extensions_features") {
   public_deps = [
     ":qt_api_features",
     ":qt_permission_features",
+    "//chrome/common/extensions/api:extensions_features",
     "//extensions/common/api:extensions_features",
   ]
 }
diff --git a/src/core/common/extensions/extensions_api_provider_qt.cpp b/src/core/common/extensions/extensions_api_provider_qt.cpp
index 22154a9d1..81eb76f3e 100644
--- a/src/core/common/extensions/extensions_api_provider_qt.cpp
+++ b/src/core/common/extensions/extensions_api_provider_qt.cpp
@@ -39,6 +39,8 @@
 
 #include "extensions_api_provider_qt.h"
 
+#include "chrome/common/extensions/permissions/chrome_api_permissions.h"
+#include "chrome/common/extensions/api/generated_schemas.h"
 #include "chrome/grit/common_resources.h"
 
 #include "extensions/common/api/api_features.h"
@@ -51,6 +53,7 @@
 #include "extensions/common/features/json_feature_provider_source.h"
 #include "extensions/common/permissions/permissions_info.h"
 #include "extensions/grit/extensions_resources.h"
+#include "qtwebengine/common/extensions/api/generated_schemas.h"
 
 #include "qt_api_features.h"
 //#include "qt_behavior_features.h"
@@ -85,16 +88,30 @@ void ExtensionsAPIProviderQt::AddPermissionFeatures(FeatureProvider *provider)
 
 bool ExtensionsAPIProviderQt::IsAPISchemaGenerated(const std::string &name)
 {
-    return api::GeneratedSchemas::IsGenerated(name);
+    return api::GeneratedSchemas::IsGenerated(name) ||
+            api::ChromeGeneratedSchemas::IsGenerated(name) ||
+            api::QtWebEngineGeneratedSchemas::IsGenerated(name);
 }
 
 base::StringPiece ExtensionsAPIProviderQt::GetAPISchema(const std::string &name)
 {
-    return api::GeneratedSchemas::Get(name);
+    if (!api::GeneratedSchemas::Get(name).empty())
+        return api::GeneratedSchemas::Get(name);
+
+    if (!api::ChromeGeneratedSchemas::Get(name).empty())
+        return api::ChromeGeneratedSchemas::Get(name);
+
+    if (!api::QtWebEngineGeneratedSchemas::Get(name).empty())
+        return api::QtWebEngineGeneratedSchemas::Get(name);
+
+    return "";
 }
 
 void ExtensionsAPIProviderQt::RegisterPermissions(PermissionsInfo* permissions_info)
 {
+    permissions_info->RegisterPermissions(
+        chrome_api_permissions::GetPermissionInfos(),
+        chrome_api_permissions::GetPermissionAliases());
 }
 
 }
diff --git a/src/core/common/extensions/extensions_client_qt.cpp b/src/core/common/extensions/extensions_client_qt.cpp
index dd1de1483..c4cc2321a 100644
--- a/src/core/common/extensions/extensions_client_qt.cpp
+++ b/src/core/common/extensions/extensions_client_qt.cpp
@@ -108,18 +108,18 @@ void ExtensionsClientQt::FilterHostPermissions(const URLPatternSet &hosts,
 {
 }
 
-// Replaces the scripting whitelist with |whitelist|. Used in the renderer{}
+// Replaces the scripting allowlist with |allowlist|. Used in the renderer{}
 // only used for testing in the browser process.
-void ExtensionsClientQt::SetScriptingWhitelist(const ExtensionsClient::ScriptingWhitelist &whitelist)
+void ExtensionsClientQt::SetScriptingAllowlist(const ExtensionsClient::ScriptingAllowlist &allowlist)
 {
-    scripting_whitelist_ = whitelist;
+    scripting_allowlist_ = allowlist;
 }
 
-// Return the whitelist of extensions that can run content scripts on
+// Return the allowlist of extensions that can run content scripts on
 // any origin.
-const ExtensionsClient::ScriptingWhitelist &ExtensionsClientQt::GetScriptingWhitelist() const
+const ExtensionsClient::ScriptingAllowlist &ExtensionsClientQt::GetScriptingAllowlist() const
 {
-    return scripting_whitelist_;
+    return scripting_allowlist_;
 }
 
 // Get the set of chrome:// hosts that |extension| can run content scripts on.
diff --git a/src/core/common/extensions/extensions_client_qt.h b/src/core/common/extensions/extensions_client_qt.h
index e689f76b7..2466e14e3 100644
--- a/src/core/common/extensions/extensions_client_qt.h
+++ b/src/core/common/extensions/extensions_client_qt.h
@@ -87,13 +87,13 @@ public:
                                URLPatternSet *new_hosts,
                                PermissionIDSet *permissions) const override;
 
-    // Replaces the scripting whitelist with |whitelist|. Used in the renderer;
+    // Replaces the scripting allowlist with |allowlist|. Used in the renderer;
     // only used for testing in the browser process.
-    void SetScriptingWhitelist(const ScriptingWhitelist &whitelist) override;
+    void SetScriptingAllowlist(const ScriptingAllowlist &allowlist) override;
 
-    // Return the whitelist of extensions that can run content scripts on
+    // Return the allowlist of extensions that can run content scripts on
     // any origin.
-    const ScriptingWhitelist &GetScriptingWhitelist() const override;
+    const ScriptingAllowlist &GetScriptingAllowlist() const override;
 
     // Get the set of chrome:// hosts that |extension| can run content scripts on.
     URLPatternSet GetPermittedChromeSchemeHosts(const Extension *extension,
@@ -127,7 +127,7 @@ public:
     static ExtensionsClientQt *GetInstance();
 
 private:
-    ScriptingWhitelist scripting_whitelist_;
+    ScriptingAllowlist scripting_allowlist_;
     const ChromePermissionMessageProvider permission_message_provider_;
     mutable GURL update_url_;
     mutable GURL base_url_;