commit f65e928d8cd59338cec95a7daa6957f6c510fd2e
author Darin Petkov <petkov@chromium.org> Tue Jun 21 14:29:56 2011 -0700
committer Darin Petkov <petkov@chromium.org> Wed Jun 22 09:47:28 2011 -0700
tree 4d30deeadabe8da018d931d1696fde68d147702a
parent b54601c6f85577ab326da277356b88049d92ee2b

shill: Remove IPConfig/DHCPConfig's dependency on Device.

They care about the device name only so use that instead. This eliminates the
need for some circular dependencies.

BUG=chromium-os:16796
TEST=unit tests

Change-Id: Ibfa4eacac2b04b9311abfb76972aaf032c6013aa
Reviewed-on: http://gerrit.chromium.org/gerrit/2943
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>

dhcp_provider_unittest.cc

diff --git a/dhcp_provider_unittest.cc b/dhcp_provider_unittest.cc
index e36643a..14103df 100644
--- a/dhcp_provider_unittest.cc
+++ b/dhcp_provider_unittest.cc
@@ -3,8 +3,6 @@
 // found in the LICENSE file.
 
 #include "shill/dhcp_provider.h"
-#include "shill/mock_control.h"
-#include "shill/mock_device.h"
 #include "shill/mock_glib.h"
 
 using testing::Test;
@@ -17,28 +15,20 @@
 
 class DHCPProviderTest : public Test {
  public:
-  DHCPProviderTest()
-      : device_(new MockDevice(&control_interface_,
-                               NULL,
-                               NULL,
-                               kDeviceName,
-                               0)),
-        provider_(DHCPProvider::GetInstance()) {
+  DHCPProviderTest() : provider_(DHCPProvider::GetInstance()) {
     provider_->glib_ = &glib_;
   }
 
  protected:
   MockGLib glib_;
-  MockControl control_interface_;
-  scoped_refptr<MockDevice> device_;
   DHCPProvider *provider_;
 };
 
 TEST_F(DHCPProviderTest, CreateConfig) {
-  DHCPConfigRefPtr config = provider_->CreateConfig(device_);
+  DHCPConfigRefPtr config = provider_->CreateConfig(kDeviceName);
   EXPECT_TRUE(config.get());
   EXPECT_EQ(&glib_, config->glib_);
-  EXPECT_EQ(kDeviceName, config->GetDeviceName());
+  EXPECT_EQ(kDeviceName, config->device_name());
   EXPECT_TRUE(provider_->configs_.empty());
 }