Bug 968868: Move DBusWatcher to RawDBusConnection, r=qdot

DBusWatcher is a helper for RawDBusConnection. This patch moves
both classes into the same file. Calling RawDBusConnection::Watch
installs a DBusWatcher for the connection.