Add enterprise policy to turn off Bluetooth.

components/content_settings/core/common/content_settings.cc

Index: components/content_settings/core/common/content_settings.cc
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
index 65298708c8de978557f8eefb9dcf17c977c580f2..683efb38d38b08f3e4c36f5b1dcbb28d8ebcd1bb 100644
--- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc
@@ -52,6 +52,8 @@ ContentSettingsType kHistogramOrder[] = {
     CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
     CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
     CONTENT_SETTINGS_TYPE_KEYGEN,
+    CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,
+    CONTENT_SETTINGS_TYPE_BLUETOOTH,

[raymes, 2016/02/22 22:34:34]

Did you mean to add this yet?

[Jeffrey Yasskin, 2016/02/22 22:52:17]

I did, but I can remove it if you prefer. It's there so the two Bluetooth
settings are together, even though one isn't used yet.

[Jeffrey Yasskin, 2016/02/25 20:38:50]

I didn't re-add the non-GUARD enumerator when I re-added the content-settings
piece.

 };
 
 int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting,