Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
diff --git a/device/bluetooth/bluetooth_device.h b/device/bluetooth/bluetooth_device.h
index aaf4e93..95fe683 100644
--- a/device/bluetooth/bluetooth_device.h
+++ b/device/bluetooth/bluetooth_device.h
@@ -188,7 +188,7 @@
// Returns the name of the device suitable for displaying, this may
// be a synthesized string containing the address and localized type name
// if the device has no obtained name.
- virtual string16 GetName() const;
+ virtual base::string16 GetName() const;
// Returns the type of the device, limited to those we support or are
// aware of, by decoding the bluetooth class information. The returned
@@ -369,7 +369,7 @@
private:
// Returns a localized string containing the device's bluetooth address and
// a device type for display when |name_| is empty.
- string16 GetAddressWithLocalizedDeviceTypeName() const;
+ base::string16 GetAddressWithLocalizedDeviceTypeName() const;
};
} // namespace device