Change scoped_ptr to a type alias for std::unique_ptr on OS_WIN

device/bluetooth/bluetooth_remote_gatt_service_win.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/bluetooth_remote_gatt_service_win.h"
 
 #include "base/bind.h"
 #include "device/bluetooth/bluetooth_adapter_win.h"
 #include "device/bluetooth/bluetooth_device_win.h"
 #include "device/bluetooth/bluetooth_remote_gatt_characteristic_win.h"
@@ skipping 232 matching lines @@
 }
 
 void BluetoothRemoteGattServiceWin::RemoveIncludedCharacteristic(
     std::string identifier) {
   discovery_completed_included_charateristics_.erase(identifier);
   included_characteristics_.erase(identifier);
 }
 
 void BluetoothRemoteGattServiceWin::ClearIncludedCharacteristics() {
   discovery_completed_included_charateristics_.clear();
+  // Explicitly reset to null to ensure that calling GetCharacteristic() on the
+  // removed characteristic in GattDescriptorRemoved() returns null.
+  for (auto& entry : included_characteristics_)
+    entry.second.reset();
   included_characteristics_.clear();
 }
 
 }  // namespace device.