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

BUG=579229

Review-Url: https://codereview.chromium.org/2608613002
Cr-Commit-Position: refs/heads/master@{#440930}

device/bluetooth/bluetooth_device_android.cc

@@ -8,6 +8,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "device/bluetooth/bluetooth_adapter_android.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service_android.h"
@@ -246,7 +247,7 @@ void BluetoothDeviceAndroid::CreateGattRemoteService(
   std::string instance_id_string =
       base::android::ConvertJavaStringToUTF8(env, instance_id);
 
-  if (gatt_services_.find(instance_id_string) != gatt_services_.end())
+  if (base::ContainsKey(gatt_services_, instance_id_string))
     return;
 
   std::unique_ptr<BluetoothRemoteGattServiceAndroid> service =

device/bluetooth/bluetooth_device_win.cc

@@ -239,8 +239,7 @@ bool BluetoothDeviceWin::IsEqual(
       new_service_records;
   for (auto iter = device_state.service_record_states.begin();
        iter != device_state.service_record_states.end(); ++iter) {
-    std::unique_ptr<BluetoothServiceRecordWin> service_record =
-        base::MakeUnique<BluetoothServiceRecordWin>(
+    auto service_record = base::MakeUnique<BluetoothServiceRecordWin>(
         address_, (*iter)->name, (*iter)->sdp_bytes, (*iter)->gatt_uuid);
     new_services.insert(service_record->uuid());
     new_service_records[service_record->uuid().canonical_value()] =

device/bluetooth/bluetooth_remote_gatt_characteristic_android.cc

@@ -13,6 +13,7 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
+#include "base/stl_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "device/bluetooth/bluetooth_adapter_android.h"
 #include "device/bluetooth/bluetooth_remote_gatt_descriptor_android.h"
@@ -241,7 +242,7 @@ void BluetoothRemoteGattCharacteristicAndroid::CreateGattRemoteDescriptor(
   std::string instanceIdString =
       base::android::ConvertJavaStringToUTF8(env, instanceId);
 
-  DCHECK(descriptors_.find(instanceIdString) == descriptors_.end());
+  DCHECK(!base::ContainsKey(descriptors_, instanceIdString));
 
   descriptors_[instanceIdString] = BluetoothRemoteGattDescriptorAndroid::Create(
       instanceIdString, bluetooth_gatt_descriptor_wrapper,

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(