bluetooth: web: Rename Blacklist to Blocklist

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 2cb2f83c1c90d7437ff3c42d3f8f012f08d056ba..126ac3bd6020670278971e1d5577dee7094c8a2c 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -4526,13 +4526,13 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <summary>'status' values returned by Android GATT event.</summary>
 </histogram>
 
-<histogram name="Bluetooth.Web.Blacklist.ParsedNonEmptyString"

[Ilya Sherman, 2016/11/18 00:12:05]

Please mark the previous name as <obsolete>.  Also, are you comfortable with the
data discontinuity that will result from renaming this histogram?

[scheib, 2016/11/18 00:27:45]

Data discontinuity will be OK. We use this to validate that a field trial
parameter is successfully being parsed by our code in the wild - so we only need
it in the short term after deploying new parameters. 

+<histogram name="Bluetooth.Web.Blocklist.ParsedNonEmptyString"
     enum="BooleanSuccess">
   <owner>jyasskin@chromium.org</owner>
   <owner>ortuno@chromium.org</owner>
   <owner>scheib@chromium.org</owner>
   <summary>
-    Records the result of BluetoothBlacklist::Add parsing a non-empty string.
+    Records the result of BluetoothBlocklist::Add parsing a non-empty string.
     These strings will be updated dynamically by a server, and this histogram
     provides feedback that parsing is functioning correctly on clients.
 
@@ -103712,7 +103712,7 @@ value.
   <int value="10" label="Not Authorized"/>
   <int value="11" label="Not Paired"/>
   <int value="12" label="Not Supported"/>
-  <int value="13" label="Blacklisted"/>
+  <int value="13" label="Blocklisted"/>
 </enum>
 
 <enum name="WebBluetoothGetCharacteristicOutcome" type="int">
@@ -103720,7 +103720,7 @@ value.
   <int value="1" label="No device"/>
   <int value="2" label="No service"/>
   <int value="3" label="Not found"/>
-  <int value="4" label="Blacklisted"/>
+  <int value="4" label="Blocklisted"/>
   <int value="5" label="No characteristics"/>
 </enum>
 
@@ -103746,7 +103746,7 @@ value.
   <int value="10"
       label="Chooser insta-closed because Chrome isn't allowed to ask for
              permission to scan for BT devices"/>
-  <int value="11" label="Blacklisted service UUID in filter"/>
+  <int value="11" label="Blocklisted service UUID in filter"/>
   <int value="12" label="Bluetooth Overview Help link pressed."/>
   <int value="13" label="Adapter Off Help link pressed."/>
   <int value="14" label="Need Location Help link pressed."/>