1 files changed, 97 insertions, 2 deletions

diff --git a/chromium/device/bluetooth/bluetooth_adapter.cc b/chromium/device/bluetooth/bluetooth_adapter.cc
index 8cce6ece2c1..1f5922292d0 100644
--- a/chromium/device/bluetooth/bluetooth_adapter.cc
+++ b/chromium/device/bluetooth/bluetooth_adapter.cc
@@ -4,18 +4,46 @@
 
 #include "device/bluetooth/bluetooth_adapter.h"
 
+#include "base/bind.h"
 #include "base/stl_util.h"
 #include "device/bluetooth/bluetooth_device.h"
+#include "device/bluetooth/bluetooth_discovery_session.h"
 
 namespace device {
 
-BluetoothAdapter::BluetoothAdapter() {
+#if !defined(OS_CHROMEOS) && !defined(OS_WIN) && !defined(OS_MACOSX)
+//static
+base::WeakPtr<BluetoothAdapter> BluetoothAdapter::CreateAdapter(
+    const InitCallback& init_callback) {
+  return base::WeakPtr<BluetoothAdapter>();
+}
+#endif  // !defined(OS_CHROMEOS) && !defined(OS_WIN) && !defined(OS_MACOSX)
+
+const int BluetoothAdapter::kChannelAuto = 0;
+const int BluetoothAdapter::kPsmAuto = 0;
+
+BluetoothAdapter::BluetoothAdapter()
+    : weak_ptr_factory_(this) {
 }
 
 BluetoothAdapter::~BluetoothAdapter() {
   STLDeleteValues(&devices_);
 }
 
+base::WeakPtr<BluetoothAdapter> BluetoothAdapter::GetWeakPtrForTesting() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
+void BluetoothAdapter::StartDiscoverySession(
+    const DiscoverySessionCallback& callback,
+    const ErrorCallback& error_callback) {
+  AddDiscoverySession(
+      base::Bind(&BluetoothAdapter::OnStartDiscoverySession,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 callback),
+      error_callback);
+}
+
 BluetoothAdapter::DeviceList BluetoothAdapter::GetDevices() {
   ConstDeviceList const_devices =
     const_cast<const BluetoothAdapter *>(this)->GetDevices();
@@ -45,11 +73,78 @@ BluetoothDevice* BluetoothAdapter::GetDevice(const std::string& address) {
 
 const BluetoothDevice* BluetoothAdapter::GetDevice(
     const std::string& address) const {
-  DevicesMap::const_iterator iter = devices_.find(address);
+  std::string canonicalized_address =
+      BluetoothDevice::CanonicalizeAddress(address);
+  if (canonicalized_address.empty())
+    return NULL;
+
+  DevicesMap::const_iterator iter = devices_.find(canonicalized_address);
   if (iter != devices_.end())
     return iter->second;
 
   return NULL;
 }
 
+void BluetoothAdapter::AddPairingDelegate(
+    BluetoothDevice::PairingDelegate* pairing_delegate,
+    PairingDelegatePriority priority) {
+  // Remove the delegate, if it already exists, before inserting to allow a
+  // change of priority.
+  RemovePairingDelegate(pairing_delegate);
+
+  // Find the first point with a lower priority, or the end of the list.
+  std::list<PairingDelegatePair>::iterator iter = pairing_delegates_.begin();
+  while (iter != pairing_delegates_.end() && iter->second >= priority)
+    ++iter;
+
+  pairing_delegates_.insert(iter, std::make_pair(pairing_delegate, priority));
+}
+
+void BluetoothAdapter::RemovePairingDelegate(
+    BluetoothDevice::PairingDelegate* pairing_delegate) {
+  for (std::list<PairingDelegatePair>::iterator iter =
+       pairing_delegates_.begin(); iter != pairing_delegates_.end(); ++iter) {
+    if (iter->first == pairing_delegate) {
+      RemovePairingDelegateInternal(pairing_delegate);
+      pairing_delegates_.erase(iter);
+      return;
+    }
+  }
+}
+
+BluetoothDevice::PairingDelegate* BluetoothAdapter::DefaultPairingDelegate() {
+  if (pairing_delegates_.empty())
+    return NULL;
+
+  return pairing_delegates_.front().first;
+}
+
+void BluetoothAdapter::OnStartDiscoverySession(
+    const DiscoverySessionCallback& callback) {
+  VLOG(1) << "Discovery session started!";
+  scoped_ptr<BluetoothDiscoverySession> discovery_session(
+      new BluetoothDiscoverySession(scoped_refptr<BluetoothAdapter>(this)));
+  discovery_sessions_.insert(discovery_session.get());
+  callback.Run(discovery_session.Pass());
+}
+
+void BluetoothAdapter::MarkDiscoverySessionsAsInactive() {
+  // As sessions are marked as inactive they will notify the adapter that they
+  // have become inactive, upon which the adapter will remove them from
+  // |discovery_sessions_|. To avoid invalidating the iterator, make a copy
+  // here.
+  std::set<BluetoothDiscoverySession*> temp(discovery_sessions_);
+  for (std::set<BluetoothDiscoverySession*>::iterator
+          iter = temp.begin();
+       iter != temp.end(); ++iter) {
+    (*iter)->MarkAsInactive();
+  }
+}
+
+void BluetoothAdapter::DiscoverySessionBecameInactive(
+    BluetoothDiscoverySession* discovery_session) {
+  DCHECK(!discovery_session->IsActive());
+  discovery_sessions_.erase(discovery_session);
+}
+
 }  // namespace device