dbus: Make Bus::GetManagedObjects skip unavailable services.

dbus/object_manager.h

 // Copyright (c) 2013 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_MANAGER_H_
 #define DBUS_OBJECT_MANAGER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 53 matching lines @@
 //       : bus_(bus),
 //         weak_ptr_factory_(this) {
 //     object_manager_ = bus_->GetObjectManager(kServiceName, kManagerPath);
 //     object_manager_->RegisterInterface(kInterface, this);
 //   }
 //
 //   virtual ExampleClient::~ExampleClient() {
 //     object_manager_->UnregisterInterface(kInterface);
 //   }
 //
-// The D-Bus thread manager takes care of issuing the necessary call to
-// GetManagedObjects() after the implementation classes have been set up.
+// This class calls GetManagedObjects() asynchronously after the remote service
+// becomes available and additionally refreshes managed objects after the
+// service stops or restarts.
 //
 // The object manager interface class has one abstract method that must be
 // implemented by the class to create Properties structures on demand. As well
 // as implementing this, you will want to implement a public GetProperties()
 // method.
 //
 // Example:
 //   dbus::PropertySet* CreateProperties(dbus::ObjectProxy* object_proxy,
 //                                       const std::string& interface_name)
 //       override {
@@ skipping 145 matching lines @@
   //
   // BLOCKING CALL.
   void CleanUp();
 
  protected:
   virtual ~ObjectManager();
 
  private:
   friend class base::RefCountedThreadSafe<ObjectManager>;
 
-  // Connects the InterfacesAdded and InterfacesRemoved signals and calls
-  // GetManagedObjects. Called from OnSetupMatchRuleAndFilterComplete.
-  void InitializeObjects();

[Daniel Erat, 2016/09/01 17:06:25]

i moved this into OnSetupMatchRuleAndFilterComplete since the flow through these
methods is linear.

-
   // Called from the constructor to add a match rule for PropertiesChanged
   // signals on the DBus thread and set up a corresponding filter function.
   bool SetupMatchRuleAndFilter();
 
   // Called on the origin thread once the match rule and filter have been set
-  // up. |success| is false, if an error occurred during set up; it's true
-  // otherwise.
+  // up. Connects the InterfacesAdded and InterfacesRemoved signals and calls
+  // ObjectProxy::WaitForServiceToBeAvailable to initially refresh objects.
+  // |success| is false if an error occurred during setup and true otherwise.
   void OnSetupMatchRuleAndFilterComplete(bool success);
 
+  // Callback for ObjectProxy::WaitForServiceToBeAvailable that refreshes
+  // objects when the service becomes initially available. Scheduled by
+  // OnSetupMatchRuleAndFilterComplete.
+  void OnServiceInitiallyAvailable(bool service_is_available);
+
   // Called by dbus:: when a message is received. This is used to filter
   // PropertiesChanged signals from the correct sender and relay the event to
   // the correct PropertySet.
   static DBusHandlerResult HandleMessageThunk(DBusConnection* connection,
                                               DBusMessage* raw_message,
                                               void* user_data);
   DBusHandlerResult HandleMessage(DBusConnection* connection,
                                   DBusMessage* raw_message);
 
   // Called when a PropertiesChanged signal is received from the sender.
@@ skipping 91 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<ObjectManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectManager);
 };
 
 }  // namespace dbus
 
 #endif  // DBUS_OBJECT_MANAGER_H_