Index: extensions/browser/api/serial/serial_api.cc |
diff --git a/extensions/browser/api/serial/serial_api.cc b/extensions/browser/api/serial/serial_api.cc |
index 8b425a3337eeb5a8622838f2ed88bf9aa5c05e21..de70d1ad1395362af81382c84cbf883cc6b10d8b 100644 |
--- a/extensions/browser/api/serial/serial_api.cc |
+++ b/extensions/browser/api/serial/serial_api.cc |
@@ -18,7 +18,7 @@ using content::BrowserThread; |
namespace extensions { |
-namespace core_api { |
+namespace api { |
namespace { |
@@ -469,19 +469,19 @@ void SerialClearBreakFunction::Work() { |
results_ = serial::ClearBreak::Results::Create(success); |
} |
-} // namespace core_api |
+} // namespace api |
} // namespace extensions |
namespace mojo { |
// static |
-linked_ptr<extensions::core_api::serial::DeviceInfo> TypeConverter< |
- linked_ptr<extensions::core_api::serial::DeviceInfo>, |
+linked_ptr<extensions::api::serial::DeviceInfo> TypeConverter< |
+ linked_ptr<extensions::api::serial::DeviceInfo>, |
device::serial::DeviceInfoPtr>::Convert(const device::serial::DeviceInfoPtr& |
device) { |
- linked_ptr<extensions::core_api::serial::DeviceInfo> info( |
- new extensions::core_api::serial::DeviceInfo); |
+ linked_ptr<extensions::api::serial::DeviceInfo> info( |
+ new extensions::api::serial::DeviceInfo); |
info->path = device->path; |
if (device->has_vendor_id) |
info->vendor_id.reset(new int(static_cast<int>(device->vendor_id))); |