Make SignalSenderVerificationTest more robust

dbus/object_proxy.h

 // 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.
 
 #ifndef DBUS_OBJECT_PROXY_H_
 #define DBUS_OBJECT_PROXY_H_
 
 #include <dbus/dbus.h>
 
 #include <map>
@@ skipping 124 matching lines @@
   //
   // |on_connected_callback| is called when the object proxy is connected
   // to the signal, or failed to be connected, in the origin thread.
   //
   // Must be called in the origin thread.
   virtual void ConnectToSignal(const std::string& interface_name,
                                const std::string& signal_name,
                                SignalCallback signal_callback,
                                OnConnectedCallback on_connected_callback);
 
+  // Sets a callback for "NameOwnerChanged" signal. The callback is called on
+  // the origin thread when D-Bus system sends "NameOwnerChanged" for the name
+  // represented by |service_name_|.
+  virtual void SetNameOwnerChangedCallback(SignalCallback callback);
+
   // Detaches from the remote object. The Bus object will take care of
   // detaching so you don't have to do this manually.
   //
   // BLOCKING CALL.
   virtual void Detach();
 
   // Returns an empty callback that does nothing. Can be used for
   // CallMethod().
   static ResponseCallback EmptyResponseCallback();
 
@@ skipping 92 matching lines @@
   bool AddMatchRuleWithoutCallback(const std::string& match_rule,
                                    const std::string& absolute_signal_name);
 
   // Calls D-Bus's GetNameOwner method synchronously to update
   // |service_name_owner_| with the current owner of |service_name_|.
   //
   // BLOCKING CALL.
   void UpdateNameOwnerAndBlock();
 
   // Handles NameOwnerChanged signal from D-Bus's special message bus.
-  DBusHandlerResult HandleNameOwnerChanged(dbus::Signal* signal);
+  DBusHandlerResult HandleNameOwnerChanged(scoped_ptr<dbus::Signal> signal);
 
   scoped_refptr<Bus> bus_;
   std::string service_name_;
   ObjectPath object_path_;
 
   // True if the message filter was added.
   bool filter_added_;
 
   // The method table where keys are absolute signal names (i.e. interface
   // name + signal name), and values are the corresponding callbacks.
   typedef std::map<std::string, SignalCallback> MethodTable;
   MethodTable method_table_;
 
+  // The callback called when NameOwnerChanged signal is received.
+  SignalCallback name_owner_changed_callback_;
+
   std::set<std::string> match_rules_;
 
   const bool ignore_service_unknown_errors_;
 
   // Known name owner of the well-known bus name represnted by |service_name_|.
   std::string service_name_owner_;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectProxy);
 };
 
 }  // namespace dbus
 
 #endif  // DBUS_OBJECT_PROXY_H_