Add chromeos::FlimflamDeviceClient::CallGetPropertiesAndBlock/CallAddIPConfigAndBlock

chromeos/dbus/flimflam_device_client.cc

Index: chromeos/dbus/flimflam_device_client.cc
diff --git a/chromeos/dbus/flimflam_device_client.cc b/chromeos/dbus/flimflam_device_client.cc
index 18cf97fffd93bea4730e8ab4cac97400d9697bc2..bc5747548c7bc5fb6fbe665d6892a8905015c9bf 100644
--- a/chromeos/dbus/flimflam_device_client.cc
+++ b/chromeos/dbus/flimflam_device_client.cc
@@ -49,6 +49,15 @@ class FlimflamDeviceClientImpl : public FlimflamDeviceClient {
   }
 
   // FlimflamProfileClient override.
+  virtual base::DictionaryValue* CallGetPropertiesAndBlock(
+      const dbus::ObjectPath& device_path) OVERRIDE {
+    dbus::MethodCall method_call(flimflam::kFlimflamDeviceInterface,
+                                 flimflam::kGetPropertiesFunction);
+    return GetHelper(device_path)->CallDictionaryValueMethodAndBlock(
+        &method_call);
+  }
+
+  // FlimflamProfileClient override.
   virtual void ProposeScan(const dbus::ObjectPath& device_path,
                            const VoidCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamDeviceInterface,
@@ -92,6 +101,17 @@ class FlimflamDeviceClientImpl : public FlimflamDeviceClient {
   }
 
   // FlimflamProfileClient override.
+  virtual dbus::ObjectPath CallAddIPConfigAndBlock(
+      const dbus::ObjectPath& device_path,
+      const std::string& method) OVERRIDE {
+    dbus::MethodCall method_call(flimflam::kFlimflamDeviceInterface,
+                                 flimflam::kAddIPConfigFunction);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(method);
+    return GetHelper(device_path)->CallObjectPathMethodAndBlock(&method_call);
+  }
+
+  // FlimflamProfileClient override.
   virtual void RequirePin(const dbus::ObjectPath& device_path,
                           const std::string& pin,
                           bool require,
@@ -203,6 +223,12 @@ class FlimflamDeviceClientStubImpl : public FlimflamDeviceClient {
                    callback));
   }
 
+  // FlimflamDeviceClient override.
+  virtual base::DictionaryValue* CallGetPropertiesAndBlock(
+      const dbus::ObjectPath& device_path) OVERRIDE {
+    return new base::DictionaryValue;
+  }
+
   // FlimflamProfileClient override.
   virtual void ProposeScan(const dbus::ObjectPath& device_path,
                            const VoidCallback& callback) OVERRIDE {
@@ -235,6 +261,13 @@ class FlimflamDeviceClientStubImpl : public FlimflamDeviceClient {
   }
 
   // FlimflamDeviceClient override.
+  virtual dbus::ObjectPath CallAddIPConfigAndBlock(
+      const dbus::ObjectPath& device_path,
+      const std::string& method) OVERRIDE {
+    return dbus::ObjectPath();
+  }
+
+  // FlimflamDeviceClient override.
   virtual void RequirePin(const dbus::ObjectPath& device_path,
                           const std::string& pin,
                           bool require,