bluetooth: Invalidate connection objects if a connection fails and add histograms

device/bluetooth/bluetooth_device.cc

 // Copyright (c) 2012 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_device.h"
 
 #include <string>
 
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
@@ skipping 279 matching lines @@
   }
   create_gatt_connection_success_callbacks_.clear();
   create_gatt_connection_error_callbacks_.clear();
 }
 
 void BluetoothDevice::DidFailToConnectGatt(ConnectErrorCode error) {
   for (const auto& error_callback : create_gatt_connection_error_callbacks_)
     error_callback.Run(error);
   create_gatt_connection_success_callbacks_.clear();
   create_gatt_connection_error_callbacks_.clear();
+
+  // TODO(ortuno): We shouldn't need to invalidate connections since
+  // DidFailToConnectGatt should only be called when a connection attempt
+  // fails and there are no connection objects.
+  // http://crbug.com/570850
+  for (BluetoothGattConnection* connection : gatt_connections_) {

[scheib, 2016/01/15 01:39:45]

DCHECK this instead.

[ortuno, 2016/01/15 21:34:41]

Done.

+    connection->InvalidateConnectionReference();
+  }
+  gatt_connections_.clear();
 }
 
 void BluetoothDevice::DidDisconnectGatt() {
   // Pending calls to connect GATT are not expected, if they were then
-  // DidFailToConnectGatt should be called. But in case callbacks exist
-  // flush them to ensure a consistent state.
-  if (create_gatt_connection_error_callbacks_.size() > 0) {
-    VLOG(1) << "Unexpected / unexplained DidDisconnectGatt call while "
-               "create_gatt_connection_error_callbacks_ are pending.";
-  }
-  DidFailToConnectGatt(ERROR_FAILED);
+  // DidFailToConnectGatt should have been called.
+  CHECK(!create_gatt_connection_error_callbacks_.size());

[scheib, 2016/01/15 01:39:44]

If you use CHECK, please TODO and file a ship blocking issue to return to
DCHECK.

I think DCHECK is sufficient though.

[ortuno, 2016/01/15 21:34:41]

Done.

 
   // Invalidate all BluetoothGattConnection objects.
   for (BluetoothGattConnection* connection : gatt_connections_) {
     connection->InvalidateConnectionReference();
   }
   gatt_connections_.clear();
 }
 
 void BluetoothDevice::AddGattConnection(BluetoothGattConnection* connection) {
   auto result = gatt_connections_.insert(connection);
@@ skipping 16 matching lines @@
                       base::BinaryValue::CreateWithCopiedBuffer(buffer, size));
 }
 
 void BluetoothDevice::Pair(PairingDelegate* pairing_delegate,
                            const base::Closure& callback,
                            const ConnectErrorCallback& error_callback) {
   NOTREACHED();
 }
 
 }  // namespace device