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