Clean up Bluetooth API implementation.

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 0d0a241fae2612575fb56b85f92bc2f9aaaecbab..bf962c07ffb08d3cd4c77c8786c326ef4d467f9f 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -38421,8 +38421,8 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="704" label="METRICSPRIVATE_RECORDSPARSEVALUE"/>
   <int value="705" label="HOTWORDPRIVATE_SETAUDIOLOGGINGENABLED"/>
   <int value="706" label="BLUETOOTHPRIVATE_SETADAPTERSTATE"/>
-  <int value="707" label="BLUETOOTHPRIVATE_ENABLEPAIRING"/>
-  <int value="708" label="BLUETOOTHPRIVATE_DISABLEPAIRING"/>
+  <int value="707" label="DELETED_BLUETOOTHPRIVATE_ENABLEPAIRING"/>
+  <int value="708" label="DELETED_BLUETOOTHPRIVATE_DISABLEPAIRING"/>
   <int value="709" label="BLUETOOTHPRIVATE_SETPAIRINGRESPONSE"/>
   <int value="710" label="NETWORKINGPRIVATE_GETCAPTIVEPORTALSTATUS"/>
   <int value="711" label="AUTOMATIONINTERNAL_PERFORMACTION"/>
@@ -38551,15 +38551,15 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="823" label="GCDPRIVATE_GETCLOUDDEVICELIST"/>
   <int value="824" label="GCDPRIVATE_QUERYFORNEWLOCALDEVICES"/>
   <int value="825" label="GCDPRIVATE_STARTSETUP"/>
-  <int value="826" label="GCDPRIVATE_SETWIFINETWORKS"/>
-  <int value="827" label="GCDPRIVATE_SETWIFICREDENTIALS"/>
+  <int value="826" label="GCDPRIVATE_SETWIFINETWORK"/>
+  <int value="827" label="GCDPRIVATE_SETWIFIPASSWORD"/>
   <int value="828" label="GCDPRIVATE_CONFIRMCODE"/>
   <int value="829" label="GCDPRIVATE_STOPSETUP"/>
   <int value="830" label="TABS_SETZOOM"/>
   <int value="831" label="TABS_GETZOOM"/>
   <int value="832" label="TABS_SETZOOMSETTINGS"/>
   <int value="833" label="TABS_GETZOOMSETTINGS"/>
-  <int value="834" label="GCDPRIVATE_GETCOMMANDDEFS"/>
+  <int value="834" label="GCDPRIVATE_GETCOMMANDDEFINITIONS"/>
   <int value="835" label="GCDPRIVATE_INSERTCOMMAND"/>
   <int value="836" label="GCDPRIVATE_GETCOMMAND"/>
   <int value="837" label="GCDPRIVATE_CANCELCOMMAND"/>