Add support for creating bluetooth RFCOMM sockets.

chrome/browser/chromeos/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 "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 
+#include <map>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
+#include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_socket.h"
 #include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h"
 #include "chrome/browser/chromeos/dbus/bluetooth_agent_service_provider.h"
 #include "chrome/browser/chromeos/dbus/bluetooth_device_client.h"
 #include "chrome/browser/chromeos/dbus/bluetooth_input_client.h"
+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/introspectable_client.h"
 #include "chrome/browser/chromeos/dbus/introspect_util.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "dbus/bus.h"
 #include "dbus/object_path.h"
 #include "grit/generated_resources.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 BluetoothDevice::BluetoothDevice(BluetoothAdapter* adapter)
   : weak_ptr_factory_(this),
@@ skipping 356 matching lines @@
   DCHECK(device_path == object_path_);
   if (success) {
     DVLOG(1) << "Disconnection successful: " << address_;
   } else {
     LOG(WARNING) << "Disconnection failed: " << address_;
     error_callback.Run();
   }
 }
 
 void BluetoothDevice::Forget(ErrorCallback error_callback) {
+  CloseAllSockets();
   DBusThreadManager::Get()->GetBluetoothAdapterClient()->
       RemoveDevice(adapter_->object_path_,
                    object_path_,
                    base::Bind(&BluetoothDevice::ForgetCallback,
                               weak_ptr_factory_.GetWeakPtr(),
                               error_callback));
 }
 
+void BluetoothDevice::CloseAllSockets() {
+  for (SocketMap::const_iterator i = socket_map_.begin();
+      i != socket_map_.end(); ++i) {
+    BluetoothSocket* socket = i->second;
+    socket->Close();
+    delete socket;

[keybuk, 2012/04/16 22:25:36]

Could this be encapsulated as simply dropping the reference to the socket from
the map?

+  }
+  socket_map_.clear();
+}
+
+base::WeakPtr<BluetoothSocket> BluetoothDevice::OpenSocket(
+    const std::string &service_uuid) {

[keybuk, 2012/04/16 22:25:36]

nit: "& " not " &"

+  // TODO(keybuk): dbus stuff
+  LOG(ERROR) << "NIY: returning dummy socket for now";
+
+  int socket_id = -1;
+  BluetoothSocket* socket = new BluetoothSocket(this, service_uuid, socket_id);
+  socket_map_[socket_id] = socket;
+  return socket->AsWeakPtr();
+}
+
+void BluetoothDevice::CloseSocket(int socket_id) {
+  SocketMap::iterator it = socket_map_.find(socket_id);
+
+  if (it == socket_map_.end()) {
+    return;
+  }
+
+  BluetoothSocket* socket = it->second;
+  socket->Close();
+  delete socket;

[keybuk, 2012/04/16 22:25:36]

As above, could this be a drop of a reference rather than an explicit delete?

+
+  socket_map_.erase(it);
+}
+
 void BluetoothDevice::ForgetCallback(ErrorCallback error_callback,
                                      const dbus::ObjectPath& adapter_path,
                                      bool success) {
   // It's quite normal that this path never gets called on success; we use a
   // weak pointer, and bluetoothd might send the DeviceRemoved signal before
   // the method reply, in which case this object is deleted and the
   // callback never takes place. Therefore don't do anything here for the
   // success case.
   if (!success) {
     LOG(WARNING) << "Forget failed: " << address_;
@@ skipping 118 matching lines @@
 // static
 BluetoothDevice* BluetoothDevice::CreateUnbound(
     BluetoothAdapter* adapter,
     const BluetoothDeviceClient::Properties* properties) {
   BluetoothDevice* device = new BluetoothDevice(adapter);
   device->Update(properties, false);
   return device;
 }
 
 }  // namespace chromeos