Index: chrome/browser/extensions/api/serial/serial_api.cc |
diff --git a/chrome/browser/extensions/api/serial/serial_api.cc b/chrome/browser/extensions/api/serial/serial_api.cc |
index 9fcd01591136ef326c5946ba930bcc9c9053bbbe..128c03cba2d4d98aed5baf66cf4761943f816b46 100644 |
--- a/chrome/browser/extensions/api/serial/serial_api.cc |
+++ b/chrome/browser/extensions/api/serial/serial_api.cc |
@@ -87,7 +87,7 @@ void SerialGetDevicesFunction::Work() { |
scoped_ptr<device::SerialDeviceEnumerator> enumerator = |
device::SerialDeviceEnumerator::Create(); |
- mojo::Array<device::SerialDeviceInfoPtr> devices = enumerator->GetDevices(); |
+ mojo::Array<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices(); |
results_ = serial::GetDevices::Results::Create( |
devices.To<std::vector<linked_ptr<serial::DeviceInfo> > >()); |
} |
@@ -411,9 +411,9 @@ namespace mojo { |
// static |
linked_ptr<extensions::api::serial::DeviceInfo> |
-TypeConverter<device::SerialDeviceInfoPtr, |
+TypeConverter<device::serial::DeviceInfoPtr, |
linked_ptr<extensions::api::serial::DeviceInfo> >:: |
- ConvertTo(const device::SerialDeviceInfoPtr& device) { |
+ ConvertTo(const device::serial::DeviceInfoPtr& device) { |
linked_ptr<extensions::api::serial::DeviceInfo> info( |
new extensions::api::serial::DeviceInfo); |
info->path = device->path; |