Followup cleanup from the removal of base::ScopedPtrHashMap from device/.

device/bluetooth/bluetooth_remote_gatt_service_android.cc

Index: device/bluetooth/bluetooth_remote_gatt_service_android.cc
diff --git a/device/bluetooth/bluetooth_remote_gatt_service_android.cc b/device/bluetooth/bluetooth_remote_gatt_service_android.cc
index c7b20ad165a39424dfefc5fcb95cb7bd839b1d11..3864070230b88225c1fbe7d82614554b2cad3fa3 100644
--- a/device/bluetooth/bluetooth_remote_gatt_service_android.cc
+++ b/device/bluetooth/bluetooth_remote_gatt_service_android.cc
@@ -8,6 +8,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
+#include "base/stl_util.h"
 #include "device/bluetooth/bluetooth_adapter_android.h"
 #include "device/bluetooth/bluetooth_device_android.h"
 #include "device/bluetooth/bluetooth_remote_gatt_characteristic_android.h"
@@ -166,7 +167,7 @@ void BluetoothRemoteGattServiceAndroid::CreateGattRemoteCharacteristic(
   std::string instance_id_string =
       base::android::ConvertJavaStringToUTF8(env, instance_id);
 
-  DCHECK(characteristics_.find(instance_id_string) == characteristics_.end());
+  DCHECK(!base::ContainsKey(characteristics_, instance_id_string));
 
   characteristics_[instance_id_string] =
       BluetoothRemoteGattCharacteristicAndroid::Create(