diff -r 000000000000 -r 6474c204b198 ipc/dbus/RawDBusConnection.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ipc/dbus/RawDBusConnection.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,67 @@
+/* -*- 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_ipc_dbus_gonk_rawdbusconnection_h__
+#define mozilla_ipc_dbus_gonk_rawdbusconnection_h__
+
+#include "mozilla/Scoped.h"
+
+struct DBusConnection;
+struct DBusError;
+struct DBusMessage;
+
+namespace mozilla {
+namespace ipc {
+
+typedef void (*DBusReplyCallback)(DBusMessage*, void*);
+
+class RawDBusConnection
+{
+  struct ScopedDBusConnectionPtrTraits : ScopedFreePtrTraits<DBusConnection>
+  {
+    static void release(DBusConnection* ptr);
+  };
+
+public:
+  RawDBusConnection();
+  virtual ~RawDBusConnection();
+
+  nsresult EstablishDBusConnection();
+
+  bool Watch();
+
+  DBusConnection* GetConnection()
+  {
+    return mConnection;
+  }
+
+  bool Send(DBusMessage* aMessage);
+
+  bool SendWithReply(DBusReplyCallback aCallback, void* aData,
+                     int aTimeout, DBusMessage* aMessage);
+
+  bool SendWithReply(DBusReplyCallback aCallback, void* aData,
+                     int aTimeout,
+                     const char* aDestination,
+                     const char* aPath, const char* aIntf,
+                     const char *aFunc, int aFirstArgType, ...);
+
+protected:
+  DBusMessage* BuildDBusMessage(const char* aDestination,
+                                const char* aPath, const char* aIntf,
+                                const char* aFunc, int aFirstArgType,
+                                va_list args);
+
+  Scoped<ScopedDBusConnectionPtrTraits> mConnection;
+
+private:
+  static bool sDBusIsInit;
+};
+
+}
+}
+
+#endif