Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / device / bluetooth / bluetooth_adapter.cc

diff --git a/src/device/bluetooth/bluetooth_adapter.cc b/src/device/bluetooth/bluetooth_adapter.cc
index ffa27ef..3aa39ea 100644 (file)
--- a/src/device/bluetooth/bluetooth_adapter.cc
+++ b/src/device/bluetooth/bluetooth_adapter.cc
@@ -11,6 +11,15 @@
 
 namespace device {
 
+#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)
+
+
 BluetoothAdapter::BluetoothAdapter()
     : weak_ptr_factory_(this) {
 }
@@ -19,6 +28,10 @@ BluetoothAdapter::~BluetoothAdapter() {
   STLDeleteValues(&devices_);
 }
 
+base::WeakPtr<BluetoothAdapter> BluetoothAdapter::GetWeakPtrForTesting() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
 void BluetoothAdapter::StartDiscoverySession(
     const DiscoverySessionCallback& callback,
     const ErrorCallback& error_callback) {