Refactor BluetoothAllowedDevicesMap

content/browser/storage_partition_impl.cc

Index: content/browser/storage_partition_impl.cc
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
index 446e3e0084838a1aa3749bcb069f004663b909fa..4505cc4b3edd606ee72847a2b475b60931f7385a 100644
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -377,7 +377,8 @@ StoragePartitionImpl::StoragePartitionImpl(
     PlatformNotificationContextImpl* platform_notification_context,
     BackgroundSyncContext* background_sync_context,
     PaymentAppContextImpl* payment_app_context,
-    scoped_refptr<BroadcastChannelProvider> broadcast_channel_provider)
+    scoped_refptr<BroadcastChannelProvider> broadcast_channel_provider,
+    scoped_refptr<BluetoothAllowedDevicesMap> bluetooth_allowed_devices_map)
     : partition_path_(partition_path),
       quota_manager_(quota_manager),
       appcache_service_(appcache_service),
@@ -394,6 +395,7 @@ StoragePartitionImpl::StoragePartitionImpl(
       background_sync_context_(background_sync_context),
       payment_app_context_(payment_app_context),
       broadcast_channel_provider_(std::move(broadcast_channel_provider)),
+      bluetooth_allowed_devices_map_(std::move(bluetooth_allowed_devices_map)),
       browser_context_(browser_context) {}
 
 StoragePartitionImpl::~StoragePartitionImpl() {
@@ -528,6 +530,9 @@ std::unique_ptr<StoragePartitionImpl> StoragePartitionImpl::Create(
   scoped_refptr<BroadcastChannelProvider>
       broadcast_channel_provider = new BroadcastChannelProvider();
 
+  scoped_refptr<BluetoothAllowedDevicesMap> bluetooth_allowed_devices_map =
+      new BluetoothAllowedDevicesMap();
+
   std::unique_ptr<StoragePartitionImpl> storage_partition(
       new StoragePartitionImpl(
           context, partition_path, quota_manager.get(), appcache_service.get(),
@@ -537,7 +542,8 @@ std::unique_ptr<StoragePartitionImpl> StoragePartitionImpl::Create(
           push_messaging_context.get(), special_storage_policy.get(),
           host_zoom_level_context.get(), platform_notification_context.get(),
           background_sync_context.get(), payment_app_context.get(),
-          std::move(broadcast_channel_provider)));
+          std::move(broadcast_channel_provider),
+          std::move(bluetooth_allowed_devices_map)));
 
   service_worker_context->set_storage_partition(storage_partition.get());
 
@@ -620,6 +626,11 @@ BroadcastChannelProvider* StoragePartitionImpl::GetBroadcastChannelProvider() {
   return broadcast_channel_provider_.get();
 }
 
+BluetoothAllowedDevicesMap*
+StoragePartitionImpl::GetBluetoothAllowedDevicesMap() {
+  return bluetooth_allowed_devices_map_.get();
+}
+
 void StoragePartitionImpl::OpenLocalStorage(
     const url::Origin& origin,
     mojo::InterfaceRequest<mojom::LevelDBWrapper> request) {
@@ -910,6 +921,10 @@ void StoragePartitionImpl::Flush() {
     GetDOMStorageContext()->Flush();
 }
 
+void StoragePartitionImpl::ClearBluetoothAllowedDevicesMap() {
+  bluetooth_allowed_devices_map_->Clear();
+}
+
 BrowserContext* StoragePartitionImpl::browser_context() const {
   return browser_context_;
 }