Subclass PermissionManager

browser/BUILD.gn

@@ -80,6 +80,7 @@ source_set("browser") {
     "//brave/components/omnibox/browser:brave_autocomplete",
     "extensions",
     "net",
+    "permissions",
   ]
 
   if (is_mac) {

browser/permissions/BUILD.gn

@@ -0,0 +1,12 @@
+import("//build/config/features.gni")
+
+source_set("permissions") {
+  sources = [
+    "brave_permission_manager.cc",
+    "brave_permission_manager.h",
+  ]
+
+  deps = [
+    "//chrome/browser",
+  ]
+}

browser/permissions/brave_permission_manager.cc

@@ -0,0 +1,13 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/browser/permissions/brave_permission_manager.h"
+
+#include "brave/browser/autoplay/autoplay_permission_context.h"
+
+BravePermissionManager::BravePermissionManager(Profile* profile)
+  : PermissionManager(profile) {
+  permission_contexts_[CONTENT_SETTINGS_TYPE_AUTOPLAY] =
+      std::make_unique<AutoplayPermissionContext>(profile);
+}

browser/permissions/brave_permission_manager.h

@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_H_
+#define BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_H_
+
+#include "chrome/browser/permissions/permission_manager.h"
+
+class BravePermissionManager : public PermissionManager {
+ public:
+  explicit BravePermissionManager(Profile* profile);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(BravePermissionManager);
+};
+
+#endif // BRAVE_BROWSER_PERMISSION_BRAVE_PERMISSION_MANAGER_H_

chromium_src/chrome/browser/permissions/permission_manager_factory.cc

@@ -0,0 +1,2 @@
+#define PermissionManager BravePermissionManager
+#include "../../../../../../chrome/browser/permissions/permission_manager_factory.cc"

patches/chrome-browser-permissions-permission_manager.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
-index af0c4c0e74fbcf78f02fe112f19724260dda456a..dc1dea1a9ec64c9d7b6344ee26be2e888f217076 100644
+index af0c4c0e74fbcf78f02fe112f19724260dda456a..045a82e8484d845cd6ee7871a39b8093ffb048ae 100644
 --- a/chrome/browser/permissions/permission_manager.cc
 +++ b/chrome/browser/permissions/permission_manager.cc
 @@ -121,6 +121,8 @@ ContentSettingsType PermissionTypeToContentSetting(PermissionType permission) {
@@ -11,12 +11,3 @@ index af0c4c0e74fbcf78f02fe112f19724260dda456a..dc1dea1a9ec64c9d7b6344ee26be2e88
      case PermissionType::NUM:
        // This will hit the NOTREACHED below.
        break;
-@@ -304,6 +306,8 @@ PermissionManager::PermissionManager(Profile* profile) : profile_(profile) {
-       std::make_unique<ClipboardWritePermissionContext>(profile);
-   permission_contexts_[CONTENT_SETTINGS_TYPE_PAYMENT_HANDLER] =
-       std::make_unique<payments::PaymentHandlerPermissionContext>(profile);
-+  permission_contexts_[CONTENT_SETTINGS_TYPE_AUTOPLAY] =
-+      std::make_unique<AutoplayPermissionContext>(profile);
- }
-
- PermissionManager::~PermissionManager() {

patches/chrome-browser-permissions-permission_manager.h.patch

@@ -0,0 +1,12 @@
+diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h
+index 1a8b5734e028db6b0c063b6927a032b02d852503..a6fbebbbeb6de88c277c13570a2208c4f5b22491 100644
+--- a/chrome/browser/permissions/permission_manager.h
++++ b/chrome/browser/permissions/permission_manager.h
+@@ -120,6 +120,7 @@ class PermissionManager : public KeyedService,
+   bool IsPermissionKillSwitchOn(ContentSettingsType);
+
+  private:
++  friend class BravePermissionManager;
+   friend class PermissionManagerTest;
+   friend class GeolocationPermissionContextTests;
+