Test: make mock_acl_manager_ into unique_ptr

Bug: none
Test: updated
Flag: exempt, test only change
Change-Id: I05fe3351b4e462f3d8d11999af6c866ecbe8a73a

2 files changed, 4 insertions, 3 deletions

diff --git a/system/test/mock/mock_main_shim_entry.cc b/system/test/mock/mock_main_shim_entry.cc
index 5d68f11b9d..e8c649b6cf 100644
--- a/system/test/mock/mock_main_shim_entry.cc
+++ b/system/test/mock/mock_main_shim_entry.cc
@@ -38,7 +38,7 @@ namespace bluetooth {
 namespace hci {
 namespace testing {
 
-MockAclManager* mock_acl_manager_{nullptr};
+std::unique_ptr<MockAclManager> mock_acl_manager_;
 MockControllerInterface* mock_controller_{nullptr};
 HciInterface* mock_hci_layer_{nullptr};
 os::Handler* mock_gd_shim_handler_{nullptr};
@@ -58,7 +58,7 @@ class Dumpsys;
 
 namespace shim {
 
-hci::AclManager* GetAclManager() { return hci::testing::mock_acl_manager_; }
+hci::AclManager* GetAclManager() { return hci::testing::mock_acl_manager_.get(); }
 hci::ControllerInterface* GetController() { return hci::testing::mock_controller_; }
 hci::HciInterface* GetHciLayer() { return hci::testing::mock_hci_layer_; }
 hci::LeAdvertisingManager* GetAdvertising() { return hci::testing::mock_le_advertising_manager_; }
diff --git a/system/test/mock/mock_main_shim_entry.h b/system/test/mock/mock_main_shim_entry.h
index ca84a27193..b82b6b8122 100644
--- a/system/test/mock/mock_main_shim_entry.h
+++ b/system/test/mock/mock_main_shim_entry.h
@@ -15,6 +15,7 @@
  */
 
 #include <functional>
+#include <memory>
 
 #include "hci/acl_manager_mock.h"
 #include "hci/controller_interface_mock.h"
@@ -28,7 +29,7 @@ namespace bluetooth {
 namespace hci {
 namespace testing {
 
-extern MockAclManager* mock_acl_manager_;
+extern std::unique_ptr<MockAclManager> mock_acl_manager_;
 extern MockControllerInterface* mock_controller_;
 extern HciInterface* mock_hci_layer_;
 extern os::Handler* mock_gd_shim_handler_;