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.
   dbus_message_ref(raw_message);
   scoped_ptr<Signal> signal(
       Signal::FromRawMessage(raw_message));
 
   // Verify the signal comes from the object we're proxying for, this is
   // our last chance to return DBUS_HANDLER_RESULT_NOT_YET_HANDLED and
   // allow other object proxies to handle instead.
   const dbus::ObjectPath path = signal->GetPath();
   if (path != object_path_) {
     if (path.value() == kDbusSystemObjectPath &&
         signal->GetMember() == "NameOwnerChanged") {
       // Handle NameOwnerChanged separately
-      return HandleNameOwnerChanged(signal.get());
+      return HandleNameOwnerChanged(signal.Pass());
     }
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
   }
 
   const std::string interface = signal->GetInterface();
   const std::string member = signal->GetMember();
 
   // Check if we know about the signal.
   const std::string absolute_signal_name = GetAbsoluteSignalName(
       interface, member);
@@ skipping 168 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) {
+DBusHandlerResult ObjectProxy::HandleNameOwnerChanged(
+    scoped_ptr<Signal> 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);
+    MessageReader reader(signal.get());
     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()) {
+        const base::TimeTicks start_time = base::TimeTicks::Now();
+        Signal* released_signal = signal.release();
+        bus_->PostTaskToOriginThread(FROM_HERE,
+                                     base::Bind(&ObjectProxy::RunMethod,
+                                                this,
+                                                start_time,
+                                                name_owner_changed_callback_,
+                                                released_signal));
+      }
       return DBUS_HANDLER_RESULT_HANDLED;
     }
   }
 
   // Untrusted or uninteresting signal
   return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
 }  // namespace dbus