bluetooth: android: Clean up BluetoothRemoteGattServiceAndroid.

device/bluetooth/bluetooth_device_android.cc

Index: device/bluetooth/bluetooth_device_android.cc
diff --git a/device/bluetooth/bluetooth_device_android.cc b/device/bluetooth/bluetooth_device_android.cc
index fccd24fb682780fa15fd134fae97db342178aeca..53478bb740ef57f708b972f11963d696e27b77b8 100644
--- a/device/bluetooth/bluetooth_device_android.cc
+++ b/device/bluetooth/bluetooth_device_android.cc
@@ -236,15 +236,14 @@ void BluetoothDeviceAndroid::CreateGattRemoteService(
   if (gatt_services_.contains(instanceIdString))
     return;
 
-  BluetoothRemoteGattServiceAndroid* service =
-      BluetoothRemoteGattServiceAndroid::Create(
-          GetAdapter(), this, bluetooth_gatt_service_wrapper, instanceIdString);
-
-  gatt_services_.set(instanceIdString,
-                     make_scoped_ptr<BluetoothGattService>(service));
+  BluetoothDevice::GattServiceMap::iterator service_iterator =
+      gatt_services_.set(instanceIdString,
+                         BluetoothRemoteGattServiceAndroid::Create(
+                             GetAdapter(), this, bluetooth_gatt_service_wrapper,
+                             instanceIdString));
 
   FOR_EACH_OBSERVER(BluetoothAdapter::Observer, GetAdapter()->GetObservers(),
-                    GattServiceAdded(adapter_, this, service));
+                    GattServiceAdded(adapter_, this, service_iterator->second));
 }
 
 BluetoothDeviceAndroid::BluetoothDeviceAndroid(BluetoothAdapterAndroid* adapter)