Merge mozilla-central and birch

b2g/config/gaia.json

@@ -1,4 +1,4 @@
 {
-    "revision": "19b1966f7051577da93d84f7c7b13411a168cce9", 
+    "revision": "3f9b2319c2b3b9491a5e7dd525fe3c22cca73490", 
     "repo_path": "/integration/gaia-central"
 }

dom/bluetooth/linux/BluetoothDBusService.cpp

@@ -341,28 +341,6 @@ ExtractHandles(DBusMessage *aReply, nsTArray<uint32_t>& aOutHandles)
   }
 }
 
-// static
-bool
-BluetoothDBusService::AddServiceRecords(const char* serviceName,
-                                        unsigned long long uuidMsb,
-                                        unsigned long long uuidLsb,
-                                        int channel)
-{
-  MOZ_ASSERT(!NS_IsMainThread());
-
-  DBusMessage* reply =
-    dbus_func_args(gThreadConnection->GetConnection(),
-                   NS_ConvertUTF16toUTF8(sAdapterPath).get(),
-                   DBUS_ADAPTER_IFACE, "AddRfcommServiceRecord",
-                   DBUS_TYPE_STRING, &serviceName,
-                   DBUS_TYPE_UINT64, &uuidMsb,
-                   DBUS_TYPE_UINT64, &uuidLsb,
-                   DBUS_TYPE_UINT16, &channel,
-                   DBUS_TYPE_INVALID);
-
-  return reply ? dbus_returns_uint32(reply) : -1;
-}
-
 // static
 bool
 BluetoothDBusService::AddReservedServicesInternal(

dom/bluetooth/linux/BluetoothDBusService.h

@@ -57,18 +57,6 @@ public:
                 const nsAString& aDeviceAddress,
                 nsAString& aDevicePath) MOZ_OVERRIDE;
 
-  static bool
-  AddServiceRecords(const char* serviceName,
-                    unsigned long long uuidMsb,
-                    unsigned long long uuidLsb,
-                    int channel);
-
-  static bool
-  RemoveServiceRecords(const char* serviceName,
-                       unsigned long long uuidMsb,
-                       unsigned long long uuidLsb,
-                       int channel);
-
   static bool
   AddReservedServicesInternal(const nsTArray<uint32_t>& aServices,
                               nsTArray<uint32_t>& aServiceHandlesContainer);

ipc/dbus/DBusUtils.cpp

@@ -630,22 +630,6 @@ int dbus_returns_int32(DBusMessage *reply)
   return ret;
 }
 
-int dbus_returns_uint32(DBusMessage *reply)
-{
-  DBusError err;
-  uint32_t ret = -1;
-
-  dbus_error_init(&err);
-  if (!dbus_message_get_args(reply, &err,
-                             DBUS_TYPE_UINT32, &ret,
-                             DBUS_TYPE_INVALID)) {
-    LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, reply);
-  }
-
-  dbus_message_unref(reply);
-  return ret;
-}
-
 void DBusReplyHandler::Callback(DBusMessage* aReply, void* aData)
 {
   MOZ_ASSERT(aData);

ipc/dbus/DBusUtils.h

@@ -163,8 +163,6 @@ DBusMessage*  dbus_func_args_timeout_valist(DBusConnection* conn,
 
 int dbus_returns_int32(DBusMessage *reply);
 
-int dbus_returns_uint32(DBusMessage *reply);
-
 }
 }