dbus: Make Bus::GetManagedObjects skip unavailable services.

dbus/object_proxy.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/object_proxy.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 190 matching lines @@
 void ObjectProxy::WaitForServiceToBeAvailable(
     WaitForServiceToBeAvailableCallback callback) {
   bus_->AssertOnOriginThread();
 
   wait_for_service_to_be_available_callbacks_.push_back(callback);
   bus_->GetDBusTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&ObjectProxy::WaitForServiceToBeAvailableInternal, this));
 }
 
+bool ObjectProxy::ServiceIsAvailable() {
+  return !service_name_owner_.empty();

[hashimoto, 2016/08/15 07:23:22]

This member should be accessed only on the D-Bus thread.

+}
+
 void ObjectProxy::Detach() {
   bus_->AssertOnDBusThread();
 
   if (bus_->is_connected())
     bus_->RemoveFilterFunction(&ObjectProxy::HandleMessageThunk, this);
 
   for (const auto& match_rule : match_rules_) {
     ScopedDBusError error;
     bus_->RemoveMatch(match_rule, error.get());
     if (error.is_set()) {
@@ skipping 221 matching lines @@
 
   if (!ConnectToNameOwnerChangedSignal()) {  // Failed to connect to the signal.
     const bool service_is_ready = false;
     bus_->GetOriginTaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&ObjectProxy::RunWaitForServiceToBeAvailableCallbacks,
                    this, service_is_ready));
     return;
   }
 
-  const bool service_is_available = !service_name_owner_.empty();
+  const bool service_is_available = ServiceIsAvailable();
   if (service_is_available) {  // Service is already available.
     bus_->GetOriginTaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&ObjectProxy::RunWaitForServiceToBeAvailableCallbacks,
                    this, service_is_available));
     return;
   }
 }
 
 DBusHandlerResult ObjectProxy::HandleMessage(
@@ skipping 245 matching lines @@
     bool service_is_available) {
   bus_->AssertOnOriginThread();
 
   std::vector<WaitForServiceToBeAvailableCallback> callbacks;
   callbacks.swap(wait_for_service_to_be_available_callbacks_);
   for (size_t i = 0; i < callbacks.size(); ++i)
     callbacks[i].Run(service_is_available);
 }
 
 }  // namespace dbus