From 663e4dcd3d0a640f6704fcfa87fcdf3602384c6e Mon Sep 17 00:00:00 2001
From: dtapuska <dtapuska@chromium.org>
Date: Fri, 23 Jan 2015 06:41:21 -0800
Subject: [PATCH] dbus: Missing signals race

It was possible when running the dbus in single thread mode that dbus
signals could get lost.

This was occurring due to a race in connecting to the signal vs when
the signal was posted. Since the ConnectToSignal would fire on a PostTask
but the processing of signals would happen directly this could cause
a situation where a signal was in the task queue but the
ConnectToSignalInternal call was after it.

BUG=451098

Review URL: https://codereview.chromium.org/868753003

Cr-Commit-Position: refs/heads/master@{#312843}
---
 dbus/object_proxy.cc | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/dbus/object_proxy.cc b/dbus/object_proxy.cc
index c11f1fefe826ce..7347db0ad726fd 100644
--- a/dbus/object_proxy.cc
+++ b/dbus/object_proxy.cc
@@ -168,17 +168,20 @@ void ObjectProxy::ConnectToSignal(const std::string& interface_name,
                                   OnConnectedCallback on_connected_callback) {
   bus_->AssertOnOriginThread();
 
-  base::PostTaskAndReplyWithResult(
-      bus_->GetDBusTaskRunner(),
-      FROM_HERE,
-      base::Bind(&ObjectProxy::ConnectToSignalInternal,
-                 this,
-                 interface_name,
-                 signal_name,
-                 signal_callback),
-      base::Bind(on_connected_callback,
-                 interface_name,
-                 signal_name));
+  if (bus_->HasDBusThread()) {
+    base::PostTaskAndReplyWithResult(
+        bus_->GetDBusTaskRunner(), FROM_HERE,
+        base::Bind(&ObjectProxy::ConnectToSignalInternal, this, interface_name,
+                   signal_name, signal_callback),
+        base::Bind(on_connected_callback, interface_name, signal_name));
+  } else {
+    // If the bus doesn't have a dedicated dbus thread we need to call
+    // ConnectToSignalInternal directly otherwise we might miss a signal
+    // that is currently queued if we do a PostTask.
+    const bool success =
+        ConnectToSignalInternal(interface_name, signal_name, signal_callback);
+    on_connected_callback.Run(interface_name, signal_name, success);
+  }
 }
 
 void ObjectProxy::SetNameOwnerChangedCallback(