Add chromeos::FlimflamDeviceClient::CallGetPropertiesAndBlock/CallAddIPConfigAndBlock

chromeos/dbus/flimflam_device_client.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_FLIMFLAM_DEVICE_CLIENT_H_
 #define CHROMEOS_DBUS_FLIMFLAM_DEVICE_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 42 matching lines @@
 
   // Resets PropertyChanged signal handler.
   virtual void ResetPropertyChangedHandler(
       const dbus::ObjectPath& device_path) = 0;
 
   // Calls GetProperties method.
   // |callback| is called after the method call finishes.
   virtual void GetProperties(const dbus::ObjectPath& device_path,
                              const DictionaryValueCallback& callback) = 0;
 
+  // DEPRECATED DO NOT USE: Calls GetProperties method and blocks until the
+  // method call finishes.  The caller is responsible to delete the result.
+  // Thie method returns NULL when method call fails.

[stevenjb, 2012/04/19 16:47:00]

Can we indicate what code currently uses these and needs to be changed once
we've switched to the dbus library?

[hashimoto, 2012/04/20 02:31:22]

Done.

+  virtual base::DictionaryValue* CallGetPropertiesAndBlock(
+      const dbus::ObjectPath& device_path) = 0;
+
   // Calls ProposeScan method.
   // |callback| is called after the method call finishes.
   virtual void ProposeScan(const dbus::ObjectPath& device_path,
                            const VoidCallback& callback) = 0;
 
   // Calls SetProperty method.
   // |callback| is called after the method call finishes.
   virtual void SetProperty(const dbus::ObjectPath& device_path,
                            const std::string& name,
                            const base::Value& value,
                            const VoidCallback& callback) = 0;
 
   // Calls ClearProperty method.
   // |callback| is called after the method call finishes.
   virtual void ClearProperty(const dbus::ObjectPath& device_path,
                              const std::string& name,
                              const VoidCallback& callback) = 0;
 
   // Calls AddIPConfig method.
   // |callback| is called after the method call finishes.
   virtual void AddIPConfig(const dbus::ObjectPath& device_path,
                            const std::string& method,
                            const ObjectPathCallback& callback) = 0;
 
+  // DEPRECATED DO NOT USE: Calls AddIPConfig method and blocks until the method
+  // call finishes.
+  // This method returns an empty path when method call fails.
+  virtual dbus::ObjectPath CallAddIPConfigAndBlock(
+      const dbus::ObjectPath& device_path,
+      const std::string& method) = 0;
+
   // Calls RequirePin method.
   // |callback| is called after the method call finishes.
   virtual void RequirePin(const dbus::ObjectPath& device_path,
                           const std::string& pin,
                           bool require,
                           const VoidCallback& callback) = 0;
 
   // Calls EnterPin method.
   // |callback| is called after the method call finishes.
   virtual void EnterPin(const dbus::ObjectPath& device_path,
@@ skipping 24 matching lines @@
   // Create() should be used instead.
   FlimflamDeviceClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlimflamDeviceClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_FLIMFLAM_DEVICE_CLIENT_H_