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..c71ee5c7ad9b238a796d88b0df2295ebc0d9f011 100644
--- a/device/bluetooth/bluetooth_device_android.cc
+++ b/device/bluetooth/bluetooth_device_android.cc
@@ -236,15 +236,16 @@ 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 =

[ortuno, 2015/10/26 21:36:26]

nit: can you use auto?

[scheib, 2015/10/26 21:55:47]

This is a grey area. Style guide recommends being more explicit when the type
isn't as obvious.
http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#auto

And here it's not obvious what gatt_services_.set() returns. 

I think we should leave it explicit.

[ortuno, 2015/10/26 22:23:34]

hmm not sure how BluetoothDevice::GattServiceMap makes it more obvious. I'm ok
either way though.

+      gatt_services_.set(
+          instanceIdString,
+          make_scoped_ptr<BluetoothRemoteGattServiceAndroid>(
+              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)