diff -r 000000000000 -r 6474c204b198 dom/bluetooth/BluetoothReplyRunnable.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/bluetooth/BluetoothReplyRunnable.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,71 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_bluetooth_bluetoothreplyrunnable_h__
+#define mozilla_dom_bluetooth_bluetoothreplyrunnable_h__
+
+#include "mozilla/Attributes.h"
+#include "BluetoothCommon.h"
+#include "nsThreadUtils.h"
+#include "js/Value.h"
+
+class nsIDOMDOMRequest;
+
+BEGIN_BLUETOOTH_NAMESPACE
+
+class BluetoothReply;
+
+class BluetoothReplyRunnable : public nsRunnable
+{
+public:
+  NS_DECL_NSIRUNNABLE
+
+  BluetoothReplyRunnable(nsIDOMDOMRequest* aReq);
+
+  void SetReply(BluetoothReply* aReply);
+
+  void SetError(const nsAString& aError)
+  {
+    mErrorString = aError;
+  }
+
+  virtual void ReleaseMembers();
+
+protected:
+  virtual ~BluetoothReplyRunnable();
+
+  virtual bool ParseSuccessfulReply(JS::MutableHandle<JS::Value> aValue) = 0;
+
+  // This is an autoptr so we don't have to bring the ipdl include into the
+  // header. We assume we'll only be running this once and it should die on
+  // scope out of Run() anyways.
+  nsAutoPtr<BluetoothReply> mReply;
+
+private:
+  nsresult FireReply(JS::Handle<JS::Value> aVal);
+  nsresult FireErrorString();
+
+  nsCOMPtr<nsIDOMDOMRequest> mDOMRequest;
+  nsString mErrorString;
+};
+
+class BluetoothVoidReplyRunnable : public BluetoothReplyRunnable
+{
+public:
+  BluetoothVoidReplyRunnable(nsIDOMDOMRequest* aReq);
+ ~BluetoothVoidReplyRunnable();
+
+protected:
+  virtual bool ParseSuccessfulReply(JS::MutableHandle<JS::Value> aValue) MOZ_OVERRIDE
+  {
+    aValue.setUndefined();
+    return true;
+  }
+};
+
+END_BLUETOOTH_NAMESPACE
+
+#endif