Refactor BluetoothAllowedDevicesMap

content/browser/storage_partition_impl.h

Index: content/browser/storage_partition_impl.h
diff --git a/content/browser/storage_partition_impl.h b/content/browser/storage_partition_impl.h
index 2c20f2e08033f19d710b4a568aa0e726268e31c4..01fde4143d2032f76083b1e0de7430ce95667ee5 100644
--- a/content/browser/storage_partition_impl.h
+++ b/content/browser/storage_partition_impl.h
@@ -16,6 +16,7 @@
 #include "base/memory/ref_counted.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/background_sync/background_sync_context.h"
+#include "content/browser/bluetooth/bluetooth_allowed_devices_map.h"
 #include "content/browser/broadcast_channel/broadcast_channel_provider.h"
 #include "content/browser/cache_storage/cache_storage_context_impl.h"
 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
@@ -78,6 +79,7 @@ class CONTENT_EXPORT  StoragePartitionImpl
   BackgroundSyncContext* GetBackgroundSyncContext();
   PaymentAppContextImpl* GetPaymentAppContext();
   BroadcastChannelProvider* GetBroadcastChannelProvider();
+  BluetoothAllowedDevicesMap* GetBluetoothAllowedDevicesMap();
 
   // mojom::StoragePartitionService interface.
   void OpenLocalStorage(
@@ -107,6 +109,8 @@ class CONTENT_EXPORT  StoragePartitionImpl
 
   void Flush() override;
 
+  void ClearBluetoothAllowedDevicesMap() override;

[scheib, 2017/02/03 23:28:13]

All the overrides should be together without new-lines between them.

[juncai, 2017/02/08 06:43:49]

Done.

+
   // Can return nullptr while |this| is being destroyed.
   BrowserContext* browser_context() const;
 
@@ -182,7 +186,8 @@ class CONTENT_EXPORT  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);
 
   // We will never have both remove_origin be populated and a cookie_matcher.
   void ClearDataImpl(uint32_t remove_mask,
@@ -230,6 +235,7 @@ class CONTENT_EXPORT  StoragePartitionImpl
   scoped_refptr<BackgroundSyncContext> background_sync_context_;
   scoped_refptr<PaymentAppContextImpl> payment_app_context_;
   scoped_refptr<BroadcastChannelProvider> broadcast_channel_provider_;
+  scoped_refptr<BluetoothAllowedDevicesMap> bluetooth_allowed_devices_map_;
 
   mojo::BindingSet<mojom::StoragePartitionService> bindings_;