[shill] Continue fixing sloppy naming stuff

We were using some illegal dbus paths.  Stop :-)

BUG=chromium-os:17744
TEST=unit tests, run on device and list-devices, list-services

Change-Id: I812f0f4d3d663e2af50477d46900ea885ee69e21
Reviewed-on: http://gerrit.chromium.org/gerrit/4349
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/ipconfig.h b/ipconfig.h
index 200cf8c..b2a09d6 100644
--- a/ipconfig.h
+++ b/ipconfig.h
@@ -45,7 +45,7 @@
     int32 mtu;
   };
 
-  explicit IPConfig(const std::string &device_name);
+  IPConfig(ControlInterface *control_interface, const std::string &device_name);
   virtual ~IPConfig();
 
   const std::string &device_name() const { return device_name_; }
@@ -87,8 +87,8 @@
   FRIEND_TEST(IPConfigTest, UpdateCallback);
   FRIEND_TEST(IPConfigTest, UpdateProperties);
 
-  scoped_ptr<IPConfigAdaptorInterface> adaptor_;
   const std::string device_name_;
+  scoped_ptr<IPConfigAdaptorInterface> adaptor_;
   Properties properties_;
   scoped_ptr<Callback2<const IPConfigRefPtr&, bool>::Type> update_callback_;