From 30282723152214461629201af69cc4eabe4b991b Mon Sep 17 00:00:00 2001
From: Nigel Babu <nigelbabu@gmail.com>
Date: Tue, 15 Sep 2015 15:17:33 +0530
Subject: [PATCH] Backed out changeset e682d4ccb6a5 (bug 1203092)

---
 .../bluedroid/BluetoothDaemonSetupInterface.h |  4 ++--
 dom/bluetooth/common/BluetoothInterface.h     | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/dom/bluetooth/bluedroid/BluetoothDaemonSetupInterface.h b/dom/bluetooth/bluedroid/BluetoothDaemonSetupInterface.h
index 6441c2f89f2e..b0b637f80779 100644
--- a/dom/bluetooth/bluedroid/BluetoothDaemonSetupInterface.h
+++ b/dom/bluetooth/bluedroid/BluetoothDaemonSetupInterface.h
@@ -8,14 +8,14 @@
 #define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonSetupInterface_h
 
 #include "BluetoothCommon.h"
-#include "mozilla/ipc/DaemonSocketMessageHandlers.h"
 
 BEGIN_BLUETOOTH_NAMESPACE
 
 class BluetoothSetupResultHandler
-  : public mozilla::ipc::DaemonSocketResultHandler
 {
 public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(BluetoothSetupResultHandler)
+
   virtual void OnError(BluetoothStatus aStatus);
   virtual void RegisterModule();
   virtual void UnregisterModule();
diff --git a/dom/bluetooth/common/BluetoothInterface.h b/dom/bluetooth/common/BluetoothInterface.h
index 1532ba6cd5f7..c66a5b73e9da 100644
--- a/dom/bluetooth/common/BluetoothInterface.h
+++ b/dom/bluetooth/common/BluetoothInterface.h
@@ -9,7 +9,6 @@
 
 #include "BluetoothCommon.h"
 #include "mozilla/dom/bluetooth/BluetoothTypes.h"
-#include "mozilla/ipc/DaemonSocketMessageHandlers.h"
 
 BEGIN_BLUETOOTH_NAMESPACE
 
@@ -18,9 +17,10 @@ BEGIN_BLUETOOTH_NAMESPACE
 //
 
 class BluetoothSocketResultHandler
-  : public mozilla::ipc::DaemonSocketResultHandler
 {
 public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(BluetoothSocketResultHandler)
+
   virtual void OnError(BluetoothStatus aStatus)
   {
     BT_WARNING("Received error code %d", (int)aStatus);
@@ -155,9 +155,10 @@ protected:
 };
 
 class BluetoothHandsfreeResultHandler
-  : public mozilla::ipc::DaemonSocketResultHandler
 {
 public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(BluetoothHandsfreeResultHandler)
+
   virtual void OnError(BluetoothStatus aStatus)
   {
     BT_WARNING("Received error code %d", (int)aStatus);
@@ -302,9 +303,10 @@ protected:
 };
 
 class BluetoothA2dpResultHandler
-  : public mozilla::ipc::DaemonSocketResultHandler
 {
 public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(BluetoothA2dpResultHandler)
+
   virtual void OnError(BluetoothStatus aStatus)
   {
     BT_WARNING("Received error code %d", (int)aStatus);
@@ -404,9 +406,10 @@ protected:
 };
 
 class BluetoothAvrcpResultHandler
-  : public mozilla::ipc::DaemonSocketResultHandler
 {
 public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(BluetoothAvrcpResultHandler)
+
   virtual void OnError(BluetoothStatus aStatus)
   {
     BT_WARNING("Received error code %d", (int)aStatus);
@@ -717,9 +720,10 @@ protected:
 };
 
 class BluetoothGattResultHandler
-  : public mozilla::ipc::DaemonSocketResultHandler
 {
 public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(BluetoothGattResultHandler)
+
   virtual void OnError(BluetoothStatus aStatus)
   {
     BT_WARNING("Received error code %d", (int)aStatus);
@@ -1044,9 +1048,10 @@ protected:
 };
 
 class BluetoothResultHandler
-  : public mozilla::ipc::DaemonSocketResultHandler
 {
 public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(BluetoothResultHandler)
+
   virtual void OnError(BluetoothStatus aStatus)
   {
     BT_LOGR("Received error code %d", aStatus);