| Index: chromeos/dbus/shill_device_client.cc
 | 
| diff --git a/chromeos/dbus/shill_device_client.cc b/chromeos/dbus/shill_device_client.cc
 | 
| index 077c3fb36df65f5836f0ff2a9f367e9038b94a54..2f23db70a7273c8204703fee5cabca23c8625751 100644
 | 
| --- a/chromeos/dbus/shill_device_client.cc
 | 
| +++ b/chromeos/dbus/shill_device_client.cc
 | 
| @@ -100,16 +100,6 @@ class ShillDeviceClientImpl : public ShillDeviceClient {
 | 
|      GetHelper(device_path)->CallObjectPathMethod(&method_call, callback);
 | 
|    }
 | 
|  
 | 
| -  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);
 | 
| -  }
 | 
| -
 | 
|    virtual void RequirePin(const dbus::ObjectPath& device_path,
 | 
|                            const std::string& pin,
 | 
|                            bool require,
 | 
| @@ -312,12 +302,6 @@ class ShillDeviceClientStubImpl : public ShillDeviceClient,
 | 
|                                                  dbus::ObjectPath()));
 | 
|    }
 | 
|  
 | 
| -  virtual dbus::ObjectPath CallAddIPConfigAndBlock(
 | 
| -      const dbus::ObjectPath& device_path,
 | 
| -      const std::string& method) OVERRIDE {
 | 
| -    return dbus::ObjectPath();
 | 
| -  }
 | 
| -
 | 
|    virtual void RequirePin(const dbus::ObjectPath& device_path,
 | 
|                            const std::string& pin,
 | 
|                            bool require,
 | 
| 
 |