dbus::ObjectManager: Add a match rule for properties before GetManagedObjects.

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_manager.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 
 namespace {
 
 void EmptyCallback(bool /* success */) {
 }
 
 }  // namespace
 
 namespace dbus {
 
 // Echo, SlowEcho, AsyncEcho, BrokenMethod, GetAll, Get, Set, PerformAction,
-// GetManagedObjects.
+// GetManagedObjects
 const int TestService::kNumMethodsToExport = 9;
 
 TestService::Options::Options()
     : request_ownership_options(Bus::REQUIRE_PRIMARY) {
 }
 
 TestService::Options::~Options() {
 }
 
 TestService::TestService(const Options& options)
@@ skipping 115 matching lines @@
 void TestService::ReleaseOwnershipInternal(
     base::Closure callback) {
   bus_->ReleaseOwnership("org.chromium.TestService");
   has_ownership_ = false;
 
   bus_->GetOriginTaskRunner()->PostTask(
       FROM_HERE,
       callback);
 }
 
+void TestService::SetSendImmediatePropertiesChanged() {
+  send_immediate_properties_changed_ = true;
+}
+
 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;
   }
@@ skipping 305 matching lines @@
   else if (action == "ReleaseOwnership") {
     ReleaseOwnership(base::Bind(&TestService::PerformActionResponse,
                                 base::Unretained(this),
                                 method_call, response_sender));
     return;
   } else if (action == "Ownership") {
     ReleaseOwnership(base::Bind(&TestService::OwnershipReleased,
                                 base::Unretained(this),
                                 method_call, response_sender));
     return;
-  }
+  } else if (action == "SetSendImmediatePropertiesChanged")
+    SetSendImmediatePropertiesChanged();

[satorux1, 2014/08/29 05:20:53]

please add {} and while you are at it, please add {} elsewhere in the if-else
blocks.

http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Conditionals

However, if one part of an if-else statement uses curly braces, the other part
must too:

[armansito, 2014/08/29 16:17:08]

Done.

 
   scoped_ptr<Response> response = Response::FromMethodCall(method_call);
   response_sender.Run(response.Pass());
 }
 
 void TestService::PerformActionResponse(
     MethodCall* method_call,
     ExportedObject::ResponseSender response_sender) {
   scoped_ptr<Response> response = Response::FromMethodCall(method_call);
   response_sender.Run(response.Pass());
@@ skipping 50 matching lines @@
   object_dict_entry_writer.AppendString("org.chromium.TestInterface");
   AddPropertiesToWriter(&object_dict_entry_writer);
   object_array_writer.CloseContainer(&object_dict_entry_writer);
 
   dict_entry_writer.CloseContainer(&object_array_writer);
 
   array_writer.CloseContainer(&dict_entry_writer);
   writer.CloseContainer(&array_writer);
 
   response_sender.Run(response.Pass());
+
+  if (send_immediate_properties_changed_)
+    SendPropertyChangedSignal("ChangedTestServiceName");
 }
 
 void TestService::AddPropertiesToWriter(MessageWriter* writer) {
   // The properties response is a dictionary of strings identifying the
   // property and a variant containing the property value. We return all
   // of the properties, thus the response is:
   //
   // {
   //   "Name": Variant<"TestService">,
   //   "Version": Variant<10>,
@@ skipping 117 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