| Index: chromeos/dbus/shill_ipconfig_client.cc
 | 
| diff --git a/chromeos/dbus/shill_ipconfig_client.cc b/chromeos/dbus/shill_ipconfig_client.cc
 | 
| index 7381a2b7c2a7204bab27c0ef5cb2e3f9c46d6f72..79e81f5ca69ef5547c7c7735e891e88940b9ab7b 100644
 | 
| --- a/chromeos/dbus/shill_ipconfig_client.cc
 | 
| +++ b/chromeos/dbus/shill_ipconfig_client.cc
 | 
| @@ -53,8 +53,6 @@ class ShillIPConfigClientImpl : public ShillIPConfigClient {
 | 
|                               const VoidDBusMethodCallback& callback) OVERRIDE;
 | 
|    virtual void Remove(const dbus::ObjectPath& ipconfig_path,
 | 
|                        const VoidDBusMethodCallback& callback) OVERRIDE;
 | 
| -  virtual bool CallRemoveAndBlock(
 | 
| -      const dbus::ObjectPath& ipconfig_path) OVERRIDE;
 | 
|  
 | 
|   private:
 | 
|    typedef std::map<std::string, ShillClientHelper*> HelperMap;
 | 
| @@ -171,13 +169,6 @@ void ShillIPConfigClientImpl::Remove(
 | 
|    GetHelper(ipconfig_path)->CallVoidMethod(&method_call, callback);
 | 
|  }
 | 
|  
 | 
| -bool ShillIPConfigClientImpl::CallRemoveAndBlock(
 | 
| -    const dbus::ObjectPath& ipconfig_path) {
 | 
| -  dbus::MethodCall method_call(flimflam::kFlimflamIPConfigInterface,
 | 
| -                               flimflam::kRemoveConfigFunction);
 | 
| -  return GetHelper(ipconfig_path)->CallVoidMethodAndBlock(&method_call);
 | 
| -}
 | 
| -
 | 
|  // A stub implementation of ShillIPConfigClient.
 | 
|  class ShillIPConfigClientStubImpl : public ShillIPConfigClient {
 | 
|   public:
 | 
| @@ -231,11 +222,6 @@ class ShillIPConfigClientStubImpl : public ShillIPConfigClient {
 | 
|          FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
 | 
|    }
 | 
|  
 | 
| -  virtual bool CallRemoveAndBlock(
 | 
| -      const dbus::ObjectPath& ipconfig_path) OVERRIDE {
 | 
| -    return true;
 | 
| -  }
 | 
| -
 | 
|   private:
 | 
|    // Runs callback with |properties_|.
 | 
|    void PassProperties(const DictionaryValueCallback& callback) const {
 | 
| 
 |