Make SignalSenderVerificationTest more robust

dbus/test_service.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_TEST_SERVICE_H_
 #define DBUS_TEST_SERVICE_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
@@ skipping 47 matching lines @@
   // Returns true if the bus has the D-Bus thread.
   bool HasDBusThread();
 
   // Sends "Test" signal with the given message from the exported object.
   void SendTestSignal(const std::string& message);
 
   // Sends "Test" signal with the given message from the root object ("/").
   // This function emulates dbus-send's behavior.
   void SendTestSignalFromRoot(const std::string& message);
 
   // Request the ownership of a well-known name "TestService".

[satorux1, 2012/11/07 01:42:25]

Please add some comment about the new parameter.

[Haruki Sato, 2012/11/12 04:59:43]

Done.

-  void RequestOwnership();
+  void RequestOwnership(base::Callback<void(bool)>);

[satorux1, 2012/11/07 01:42:25]

parameter name is missing.

[Haruki Sato, 2012/11/12 04:59:43]

Done. Thanks.

+
+  // Returns whether this instance has the name ownership or not.
+  bool HasOwnership();

[satorux1, 2012/11/07 01:42:25]

bool has_ownership() const { return has_ownership_; }

[Haruki Sato, 2012/11/12 04:59:43]

Done.

 
  private:
   // Helper function for SendTestSignal().
   void SendTestSignalInternal(const std::string& message);
 
   // Helper function for SendTestSignalFromRoot.
   void SendTestSignalFromRootInternal(const std::string& message);
 
   // Helper function for ShutdownAndBlock().
   void ShutdownAndBlockInternal();
 
   // Called when an ownership request is completed.
-  void OnOwnership(const std::string& service_name,
+  void OnOwnership(base::Callback<void(bool)> callback,

[satorux1, 2012/11/07 01:42:25]

Please add some comment about the new parameter, as well as the existing
parameters. :)

[Haruki Sato, 2012/11/12 04:59:43]

Done.

+                   const std::string& service_name,
                    bool success);
 
   // Called when a method is exported.
   void OnExported(const std::string& interface_name,
                   const std::string& method_name,
                   bool success);
 
   // base::Thread override.
   virtual void Run(MessageLoop* message_loop) OVERRIDE;
 
@@ skipping 31 matching lines @@
   void SetProperty(MethodCall* method_call,
                    dbus::ExportedObject::ResponseSender response_sender);
 
   // Sends a property changed signal for the name property.
   void SendPropertyChangedSignal(const std::string& name);
 
   // Helper function for SendPropertyChangedSignal().
   void SendPropertyChangedSignalInternal(const std::string& name);
 
   // Helper function for RequestOwnership().
-  void RequestOwnershipInternal();
+  void RequestOwnershipInternal(base::Callback<void(bool)> callback);
 
   scoped_refptr<base::MessageLoopProxy> dbus_thread_message_loop_proxy_;
   base::WaitableEvent on_all_methods_exported_;
   // The number of methods actually exported.
   int num_exported_methods_;
 
+  // True iff this instance has successfully acquired the name ownership.
+  bool has_name_ownership;

[satorux1, 2012/11/07 01:42:25]

The trailing _ is missing.

[Haruki Sato, 2012/11/12 04:59:43]

Done.

+
   scoped_refptr<Bus> bus_;
   ExportedObject* exported_object_;
 };
 
 }  // namespace dbus
 
 #endif  // DBUS_TEST_SERVICE_H_