commit 19e30406a1d3123892007d20438527dc4b2f92c3
author Chris Masone <cmasone@chromium.org> Tue Jul 19 15:48:47 2011 -0700
committer Chris Masone <cmasone@chromium.org> Wed Jul 20 17:03:57 2011 -0700
tree cf4202f1603e6774d7a7b5625c2da68e01e7677a
parent 8f317b600a218afe05f2d73c59204bb98269a950

[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>

dhcp_config_unittest.cc

diff --git a/dhcp_config_unittest.cc b/dhcp_config_unittest.cc
index ef6662b..8746f8b 100644
--- a/dhcp_config_unittest.cc
+++ b/dhcp_config_unittest.cc
@@ -10,6 +10,7 @@
 #include "shill/dbus_adaptor.h"
 #include "shill/dhcp_config.h"
 #include "shill/dhcp_provider.h"
+#include "shill/mock_control.h"
 #include "shill/mock_dhcp_proxy.h"
 #include "shill/mock_glib.h"
 #include "shill/property_store_unittest.h"
@@ -31,7 +32,8 @@
  public:
   DHCPConfigTest()
       : proxy_(new MockDHCPProxy()),
-        config_(new DHCPConfig(DHCPProvider::GetInstance(),
+        config_(new DHCPConfig(&control_,
+                               DHCPProvider::GetInstance(),
                                kDeviceName,
                                &glib_)) {
     config_->proxy_.reset(proxy_);  // pass ownership
@@ -40,6 +42,7 @@
  protected:
   MockGLib glib_;
   MockDHCPProxy * const proxy_;
+  MockControl control_;
   DHCPConfigRefPtr config_;
 };