Make SignalSenderVerificationTest more robust

dbus/test_service.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/test_service.h"
 
 #include "base/bind.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "dbus/bus.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 
+namespace {
+
+void EmptyCallback(bool b) {

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

b -> /* success */

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

Done. Thanks.

+}
+
+}  // namespace
+
 namespace dbus {
 
 // Echo, SlowEcho, AsyncEcho, BrokenMethod, GetAll, Get, Set.
 const int TestService::kNumMethodsToExport = 7;
 
 TestService::Options::Options() {
 }
 
 TestService::Options::~Options() {
 }
@@ skipping 62 matching lines @@
   exported_object_->SendSignal(&signal);
 }
 
 void TestService::SendTestSignalFromRootInternal(const std::string& message) {
   dbus::Signal signal("org.chromium.TestInterface", "Test");
   dbus::MessageWriter writer(&signal);
   writer.AppendString(message);
 
   bus_->RequestOwnership("org.chromium.TestService",
                          base::Bind(&TestService::OnOwnership,
-                                    base::Unretained(this)));
+                                    base::Unretained(this),
+                                    base::Bind(EmptyCallback)));

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

base::Bind(&EmptyCallback)

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

Done. Thanks.

 
   // Use "/" just like dbus-send does.
   ExportedObject* root_object =
       bus_->GetExportedObject(dbus::ObjectPath("/"));
   root_object->SendSignal(&signal);
 }
 
-void TestService::RequestOwnership() {
+void TestService::RequestOwnership(base::Callback<void(bool)> callback) {
   message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&TestService::RequestOwnershipInternal,
-                 base::Unretained(this)));
+                 base::Unretained(this),
+                 callback));
 }
 
-void TestService::RequestOwnershipInternal() {
+void TestService::RequestOwnershipInternal(
+    base::Callback<void(bool)> callback) {
+  requesting_ownership = true;
   bus_->RequestOwnership("org.chromium.TestService",
                          base::Bind(&TestService::OnOwnership,
-                                    base::Unretained(this)));
+                                    base::Unretained(this),
+                                    callback));
 }
 
-void TestService::OnOwnership(const std::string& service_name,
+void TestService::OnOwnership(base::Callback<void(bool)> callback,
+                              const std::string& service_name,
                               bool success) {
+  has_name_ownership = success;
   LOG_IF(ERROR, !success) << "Failed to own: " << service_name;
+  callback.Run(success);
+}
+
+bool TestService::HasOwnership() {
+  return has_name_ownership;
 }
 
 void TestService::OnExported(const std::string& interface_name,
                              const std::string& method_name,
                              bool success) {
   if (!success) {
     LOG(ERROR) << "Failed to export: " << interface_name << "."
                << method_name;
     // Returning here will make WaitUntilServiceIsStarted() to time out
     // and return false.
     return;
   }
 
   ++num_exported_methods_;
   if (num_exported_methods_ == kNumMethodsToExport)
     on_all_methods_exported_.Signal();
 }
 
 void TestService::Run(MessageLoop* message_loop) {
   Bus::Options bus_options;
   bus_options.bus_type = Bus::SESSION;
   bus_options.connection_type = Bus::PRIVATE;
   bus_options.dbus_thread_message_loop_proxy = dbus_thread_message_loop_proxy_;
   bus_ = new Bus(bus_options);
 
   bus_->RequestOwnership("org.chromium.TestService",
                          base::Bind(&TestService::OnOwnership,
-                                    base::Unretained(this)));
+                                    base::Unretained(this),
+                                    base::Bind(EmptyCallback)));
 
   exported_object_ = bus_->GetExportedObject(
       dbus::ObjectPath("/org/chromium/TestObject"));
 
   int num_methods = 0;
   exported_object_->ExportMethod(
       "org.chromium.TestInterface",
       "Echo",
       base::Bind(&TestService::Echo,
                  base::Unretained(this)),
@@ skipping 298 matching lines @@
   array_writer.OpenDictEntry(&dict_entry_writer);
   dict_entry_writer.AppendString("Name");
   dict_entry_writer.AppendVariantOfString(name);
   array_writer.CloseContainer(&dict_entry_writer);
   writer.CloseContainer(&array_writer);
 
   exported_object_->SendSignal(&signal);
 }
 
 }  // namespace dbus