Merge pull request #15117 from /issues/908

Cleanup permission contexts on PermissionManager::Shutdown().
brave · Sep 19, 2022 · f494ac2 · f494ac2
2 parents 34235a6 + f48a74c
commit f494ac2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/browser/brave_wallet/ethereum_provider_impl_unittest.cc b/browser/brave_wallet/ethereum_provider_impl_unittest.cc
@@ -190,6 +190,7 @@ class EthereumProviderImplUnitTest : public testing::Test {
   void TearDown() override {
     provider_.reset();
     web_contents_.reset();
+    profile_.SetPermissionControllerDelegate(nullptr);
   }
 
   void SetUp() override {

diff --git a/components/permissions/brave_permission_manager.cc b/components/permissions/brave_permission_manager.cc
@@ -19,6 +19,11 @@ BravePermissionManager::BravePermissionManager(
     PermissionContextMap permission_contexts)
     : PermissionManager(browser_context, std::move(permission_contexts)) {}
 
+void BravePermissionManager::Shutdown() {
+  PermissionManager::Shutdown();
+  permission_contexts_.clear();
+}
+
 void BravePermissionManager::RequestPermissionsForOrigin(
     const std::vector<blink::PermissionType>& permissions,
     content::RenderFrameHost* render_frame_host,

diff --git a/components/permissions/brave_permission_manager.h b/components/permissions/brave_permission_manager.h
@@ -21,6 +21,8 @@ class BravePermissionManager : public PermissionManager {
   BravePermissionManager(const BravePermissionManager&) = delete;
   BravePermissionManager& operator=(const BravePermissionManager&) = delete;
 
+  void Shutdown() override;
+
   void RequestPermissionsForOrigin(
       const std::vector<blink::PermissionType>& permissions,
       content::RenderFrameHost* render_frame_host,