dbus: add support for synchronous PropertySet::Get

dbus/property.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/property.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 
@@ skipping 115 matching lines @@
     if (property->is_valid()) {
       property->set_valid(false);
       NotifyPropertyChanged(property->name());
     }
   }
 
   if (!callback.is_null())
     callback.Run(response);
 }
 
+bool PropertySet::GetAndBlock(PropertyBase* property) {
+  MethodCall method_call(kPropertiesInterface, kPropertiesGet);
+  MessageWriter writer(&method_call);
+  writer.AppendString(interface());
+  writer.AppendString(property->name());
+
+  DCHECK(object_proxy_);
+  scoped_ptr<dbus::Response> response(
+      object_proxy_->CallMethodAndBlock(&method_call,
+                                        ObjectProxy::TIMEOUT_USE_DEFAULT));
+
+  if (!response.get()) {
+    LOG(WARNING) << property->name() << ": GetAndBlock: failed.";
+    return false;
+  }
+
+  MessageReader reader(response.get());
+  if (property->PopValueFromReader(&reader)) {
+    property->set_valid(true);
+    NotifyPropertyChanged(property->name());
+  } else {
+    if (property->is_valid()) {
+      property->set_valid(false);
+      NotifyPropertyChanged(property->name());
+    }
+  }
+  return true;
+}
+
 void PropertySet::GetAll() {
   MethodCall method_call(kPropertiesInterface, kPropertiesGetAll);
   MessageWriter writer(&method_call);
   writer.AppendString(interface());
 
   DCHECK(object_proxy_);
   object_proxy_->CallMethod(&method_call,
                             ObjectProxy::TIMEOUT_USE_DEFAULT,
                             base::Bind(&PropertySet::OnGetAll,
                                        weak_ptr_factory_.GetWeakPtr()));
@@ skipping 31 matching lines @@
 bool PropertySet::SetAndBlock(PropertyBase* property) {
   MethodCall method_call(kPropertiesInterface, kPropertiesSet);
   MessageWriter writer(&method_call);
   writer.AppendString(interface());
   writer.AppendString(property->name());
   property->AppendSetValueToWriter(&writer);
 
   DCHECK(object_proxy_);
   scoped_ptr<dbus::Response> response(
       object_proxy_->CallMethodAndBlock(&method_call,
-      ObjectProxy::TIMEOUT_USE_DEFAULT));
+                                        ObjectProxy::TIMEOUT_USE_DEFAULT));
   if (response.get())
     return true;
   return false;
 }
 
 void PropertySet::OnSet(PropertyBase* property,
                         SetCallback callback,
                         Response* response) {
   LOG_IF(WARNING, !response) << property->name() << ": Set: failed.";
   if (!callback.is_null())
@@ skipping 444 matching lines @@
 template class Property<double>;
 template class Property<std::string>;
 template class Property<ObjectPath>;
 template class Property<std::vector<std::string> >;
 template class Property<std::vector<ObjectPath> >;
 template class Property<std::vector<uint8> >;
 template class Property<std::map<std::string, std::string>>;
 template class Property<std::vector<std::pair<std::vector<uint8_t>, uint16_t>>>;
 
 }  // namespace dbus