Make SignalSenderVerificationTest more robust

dbus/object_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "dbus/bus.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 390 matching lines @@
 
 void ObjectProxy::OnConnected(OnConnectedCallback on_connected_callback,
                               const std::string& interface_name,
                               const std::string& signal_name,
                               bool success) {
   bus_->AssertOnOriginThread();
 
   on_connected_callback.Run(interface_name, signal_name, success);
 }
 
+void ObjectProxy::SetNameOwnerChangedCallback(SignalCallback callback) {
+  bus_->AssertOnOriginThread();
+
+  name_owner_changed_callback_ = callback;
+}
+
 DBusHandlerResult ObjectProxy::HandleMessage(
     DBusConnection* connection,
     DBusMessage* raw_message) {
   bus_->AssertOnDBusThread();
 
   if (dbus_message_get_type(raw_message) != DBUS_MESSAGE_TYPE_SIGNAL)
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
   // raw_message will be unrefed on exit of the function. Increment the
   // reference so we can use it in Signal.
@@ skipping 191 matching lines @@
   scoped_ptr<Response> response(Response::FromRawMessage(response_message));
   MessageReader reader(response.get());
 
   std::string new_service_name_owner;
   if (reader.PopString(&new_service_name_owner))
     service_name_owner_ = new_service_name_owner;
   else
     service_name_owner_.clear();
 }
 
 DBusHandlerResult ObjectProxy::HandleNameOwnerChanged(Signal* signal) {

[satorux1, 2012/11/13 07:00:39]

This should be scoped_ptr<Signal>

   DCHECK(signal);
   bus_->AssertOnDBusThread();
 
   // Confirm the validity of the NameOwnerChanged signal.
   if (signal->GetMember() == "NameOwnerChanged" &&
       signal->GetInterface() == "org.freedesktop.DBus" &&
       signal->GetSender() == "org.freedesktop.DBus") {
     MessageReader reader(signal);
     std::string name, old_owner, new_owner;
     if (reader.PopString(&name) &&
         reader.PopString(&old_owner) &&
         reader.PopString(&new_owner) &&
         name == service_name_) {
       service_name_owner_ = new_owner;
+      if (!name_owner_changed_callback_.is_null())
+        name_owner_changed_callback_.Run(signal);

[satorux1, 2012/11/13 07:00:39]

Let's not call this here as we are now on the D-Bus thread. Please post this to
the origin thread.

       return DBUS_HANDLER_RESULT_HANDLED;
     }
   }
 
   // Untrusted or uninteresting signal
   return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
 }  // namespace dbus