commit 46eaaf53d5e5b92f418b8d7cbfe7e847b575791f
author Chris Masone <cmasone@chromium.org> Tue May 24 13:08:30 2011 -0700
committer Chris Masone <cmasone@chromium.org> Tue May 24 13:51:29 2011 -0700
tree fa4e4e2f7958717431b132f0219bf58581f89434
parent d7732e4b308836ed21723c1ab412f640f02abdf1

[shill] Build is broken...bad merge??

BUG=None
TEST=FEATURES=test emerge-x86-generic shill

Change-Id: I78e646c1d532adc374a7db28628238c8c4c30bdb
Reviewed-on: http://gerrit.chromium.org/gerrit/1471
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>

device.h

diff --git a/device.h b/device.h
index 44ebd0f..8e9bca8 100644
--- a/device.h
+++ b/device.h
@@ -5,6 +5,7 @@
 #ifndef SHILL_DEVICE_
 #define SHILL_DEVICE_
 
+#include <string>
 #include <vector>
 
 #include <base/memory/ref_counted.h>
@@ -35,7 +36,7 @@
   // A constructor for the Device object
   Device(ControlInterface *control_interface,
          EventDispatcher *dispatcher,
-         const string &link_name,
+         const std::string& link_name,
          int interface_index);
   virtual ~Device();
 
@@ -46,7 +47,7 @@
 
  protected:
   std::vector<scoped_refptr<Service> > services_;
-  string link_name_;
+  std::string link_name_;
   int interface_index_;
   bool running_;
 
@@ -62,7 +63,7 @@
  public:
   StubDevice(ControlInterface *control_interface,
              EventDispatcher *dispatcher,
-             const string link_name,
+             const std::string& link_name,
              int interface_index,
              Technology technology)
     : Device(control_interface, dispatcher, link_name, interface_index),

device_info_unittest.cc

diff --git a/device_info_unittest.cc b/device_info_unittest.cc
index fe88de4..5f56e65 100644
--- a/device_info_unittest.cc
+++ b/device_info_unittest.cc
@@ -13,6 +13,7 @@
 #include "shill/dbus_control.h"
 #include "shill/device_info.h"
 #include "shill/manager.h"
+#include "shill/mock_control.h"
 
 namespace shill {
 using ::testing::Test;
@@ -31,7 +32,7 @@
     return &device_info_.devices_;
   }
 protected:
-  DBusControl control_interface_;
+  MockControl control_interface_;
   Manager manager_;
   DeviceInfo device_info_;
   EventDispatcher dispatcher_;

ethernet.h

diff --git a/ethernet.h b/ethernet.h
index eeda3d2..eb87a18 100644
--- a/ethernet.h
+++ b/ethernet.h
@@ -5,6 +5,8 @@
 #ifndef SHILL_ETHERNET_
 #define SHILL_ETHERNET_
 
+#include <string>
+
 #include "shill/device.h"
 #include "shill/shill_event.h"
 
@@ -16,7 +18,7 @@
  public:
   explicit Ethernet(ControlInterface *control_interface,
                     EventDispatcher *dispatcher,
-                    const string &link_name,
+                    const std::string& link_name,
                     int interface_index);
   ~Ethernet();
   bool TechnologyIs(Device::Technology type);

mock_device.h

diff --git a/mock_device.h b/mock_device.h
index 10c6a2c..c69b7a2 100644
--- a/mock_device.h
+++ b/mock_device.h
@@ -5,6 +5,8 @@
 #ifndef SHILL_MOCK_DEVICE_
 #define SHILL_MOCK_DEVICE_
 
+#include <string>
+
 #include <base/memory/ref_counted.h>
 #include <gmock/gmock.h>
 
@@ -23,7 +25,7 @@
   // A constructor for the Device object
   MockDevice(ControlInterface *control_interface,
              EventDispatcher *dispatcher,
-             const string &link_name,
+             const std::string &link_name,
              int interface_index)
       : Device(control_interface, dispatcher, link_name, interface_index) {
     ON_CALL(*this, TechnologyIs(_)).WillByDefault(Return(false));

wifi.h

diff --git a/wifi.h b/wifi.h
index 33e29d8..844d653 100644
--- a/wifi.h
+++ b/wifi.h
@@ -5,6 +5,8 @@
 #ifndef SHILL_WIFI_
 #define SHILL_WIFI_
 
+#include <string>
+
 #include "shill/device.h"
 #include "shill/shill_event.h"
 
@@ -16,7 +18,7 @@
  public:
   explicit WiFi(ControlInterface *control_interface,
                 EventDispatcher *dispatcher,
-                const string &link_name,
+                const std::string &link_name,
                 int interface_index);
   ~WiFi();
   bool TechnologyIs(Device::Technology type);