Commit c923a269 authored by Han Leon's avatar Han Leon Committed by Commit Bot

[DeviceService] A cleanup for //device/serial

mojom::XXXPtr info(mojom::XXX::New());
==>
auto info = mojom::XXX::New();

BUG=728227

Change-Id: I583140baa7803a7628284ad16feec792e2d84634
Reviewed-on: https://chromium-review.googlesource.com/597506Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Commit-Queue: Han Leon <leon.han@intel.com>
Cr-Commit-Position: refs/heads/master@{#491593}
parent 01f38b46
...@@ -68,7 +68,7 @@ SerialDeviceEnumeratorLinux::GetDevices() { ...@@ -68,7 +68,7 @@ SerialDeviceEnumeratorLinux::GetDevices() {
udev_device_get_property_value(device.get(), kHostPathKey); udev_device_get_property_value(device.get(), kHostPathKey);
const char* bus = udev_device_get_property_value(device.get(), kHostBusKey); const char* bus = udev_device_get_property_value(device.get(), kHostBusKey);
if (path != NULL && bus != NULL) { if (path != NULL && bus != NULL) {
mojom::SerialDeviceInfoPtr info(mojom::SerialDeviceInfo::New()); auto info = mojom::SerialDeviceInfo::New();
info->path = path; info->path = path;
const char* vendor_id = const char* vendor_id =
......
...@@ -119,7 +119,7 @@ std::vector<mojom::SerialDeviceInfoPtr> GetDevicesNew() { ...@@ -119,7 +119,7 @@ std::vector<mojom::SerialDeviceInfoPtr> GetDevicesNew() {
base::mac::ScopedIOObject<io_iterator_t> scoped_it(it); base::mac::ScopedIOObject<io_iterator_t> scoped_it(it);
base::mac::ScopedIOObject<io_service_t> scoped_device; base::mac::ScopedIOObject<io_service_t> scoped_device;
while (scoped_device.reset(IOIteratorNext(scoped_it.get())), scoped_device) { while (scoped_device.reset(IOIteratorNext(scoped_it.get())), scoped_device) {
mojom::SerialDeviceInfoPtr callout_info(mojom::SerialDeviceInfo::New()); auto callout_info = mojom::SerialDeviceInfo::New();
uint16_t vendorId; uint16_t vendorId;
if (GetUInt16Property(scoped_device.get(), CFSTR(kUSBVendorID), if (GetUInt16Property(scoped_device.get(), CFSTR(kUSBVendorID),
...@@ -192,7 +192,7 @@ std::vector<mojom::SerialDeviceInfoPtr> GetDevicesOld() { ...@@ -192,7 +192,7 @@ std::vector<mojom::SerialDeviceInfoPtr> GetDevicesOld() {
std::set<std::string>::const_iterator i = valid_patterns.begin(); std::set<std::string>::const_iterator i = valid_patterns.begin();
for (; i != valid_patterns.end(); ++i) { for (; i != valid_patterns.end(); ++i) {
if (base::MatchPattern(next_device, *i)) { if (base::MatchPattern(next_device, *i)) {
mojom::SerialDeviceInfoPtr info(mojom::SerialDeviceInfo::New()); auto info = mojom::SerialDeviceInfo::New();
info->path = next_device; info->path = next_device;
devices.push_back(std::move(info)); devices.push_back(std::move(info));
break; break;
......
...@@ -109,7 +109,7 @@ std::vector<mojom::SerialDeviceInfoPtr> GetDevicesNew() { ...@@ -109,7 +109,7 @@ std::vector<mojom::SerialDeviceInfoPtr> GetDevicesNew() {
// serial device. If the COM can't be found, ignore the device. // serial device. If the COM can't be found, ignore the device.
continue; continue;
mojom::SerialDeviceInfoPtr info(mojom::SerialDeviceInfo::New()); auto info = mojom::SerialDeviceInfo::New();
info->path = com_port; info->path = com_port;
std::string display_name; std::string display_name;
...@@ -145,7 +145,7 @@ std::vector<mojom::SerialDeviceInfoPtr> GetDevicesOld() { ...@@ -145,7 +145,7 @@ std::vector<mojom::SerialDeviceInfoPtr> GetDevicesOld() {
HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\SERIALCOMM\\"); HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\SERIALCOMM\\");
std::vector<mojom::SerialDeviceInfoPtr> devices; std::vector<mojom::SerialDeviceInfoPtr> devices;
for (; iter_key.Valid(); ++iter_key) { for (; iter_key.Valid(); ++iter_key) {
mojom::SerialDeviceInfoPtr info(mojom::SerialDeviceInfo::New()); auto info = mojom::SerialDeviceInfo::New();
info->path = base::UTF16ToASCII(iter_key.Value()); info->path = base::UTF16ToASCII(iter_key.Value());
devices.push_back(std::move(info)); devices.push_back(std::move(info));
} }
......
...@@ -411,8 +411,7 @@ mojom::SerialDeviceControlSignalsPtr SerialIoHandlerPosix::GetControlSignals() ...@@ -411,8 +411,7 @@ mojom::SerialDeviceControlSignalsPtr SerialIoHandlerPosix::GetControlSignals()
return mojom::SerialDeviceControlSignalsPtr(); return mojom::SerialDeviceControlSignalsPtr();
} }
mojom::SerialDeviceControlSignalsPtr signals( auto signals = mojom::SerialDeviceControlSignals::New();
mojom::SerialDeviceControlSignals::New());
signals->dcd = (status & TIOCM_CAR) != 0; signals->dcd = (status & TIOCM_CAR) != 0;
signals->cts = (status & TIOCM_CTS) != 0; signals->cts = (status & TIOCM_CTS) != 0;
signals->dsr = (status & TIOCM_DSR) != 0; signals->dsr = (status & TIOCM_DSR) != 0;
...@@ -464,7 +463,7 @@ mojom::SerialConnectionInfoPtr SerialIoHandlerPosix::GetPortInfo() const { ...@@ -464,7 +463,7 @@ mojom::SerialConnectionInfoPtr SerialIoHandlerPosix::GetPortInfo() const {
return mojom::SerialConnectionInfoPtr(); return mojom::SerialConnectionInfoPtr();
} }
mojom::SerialConnectionInfoPtr info(mojom::SerialConnectionInfo::New()); auto info = mojom::SerialConnectionInfo::New();
#if defined(OS_LINUX) #if defined(OS_LINUX)
// Linux forces c_ospeed to contain the correct value, which is nice. // Linux forces c_ospeed to contain the correct value, which is nice.
info->bitrate = config.c_ospeed; info->bitrate = config.c_ospeed;
......
...@@ -466,8 +466,7 @@ mojom::SerialDeviceControlSignalsPtr SerialIoHandlerWin::GetControlSignals() ...@@ -466,8 +466,7 @@ mojom::SerialDeviceControlSignalsPtr SerialIoHandlerWin::GetControlSignals()
return mojom::SerialDeviceControlSignalsPtr(); return mojom::SerialDeviceControlSignalsPtr();
} }
mojom::SerialDeviceControlSignalsPtr signals( auto signals = mojom::SerialDeviceControlSignals::New();
mojom::SerialDeviceControlSignals::New());
signals->dcd = (status & MS_RLSD_ON) != 0; signals->dcd = (status & MS_RLSD_ON) != 0;
signals->cts = (status & MS_CTS_ON) != 0; signals->cts = (status & MS_CTS_ON) != 0;
signals->dsr = (status & MS_DSR_ON) != 0; signals->dsr = (status & MS_DSR_ON) != 0;
...@@ -501,7 +500,7 @@ mojom::SerialConnectionInfoPtr SerialIoHandlerWin::GetPortInfo() const { ...@@ -501,7 +500,7 @@ mojom::SerialConnectionInfoPtr SerialIoHandlerWin::GetPortInfo() const {
VPLOG(1) << "Failed to get serial port info"; VPLOG(1) << "Failed to get serial port info";
return mojom::SerialConnectionInfoPtr(); return mojom::SerialConnectionInfoPtr();
} }
mojom::SerialConnectionInfoPtr info(mojom::SerialConnectionInfo::New()); auto info = mojom::SerialConnectionInfo::New();
info->bitrate = SpeedConstantToBitrate(config.BaudRate); info->bitrate = SpeedConstantToBitrate(config.BaudRate);
info->data_bits = DataBitsConstantToEnum(config.ByteSize); info->data_bits = DataBitsConstantToEnum(config.ByteSize);
info->parity_bit = ParityBitConstantToEnum(config.Parity); info->parity_bit = ParityBitConstantToEnum(config.Parity);
......
...@@ -80,14 +80,13 @@ bool TestSerialIoHandler::ConfigurePortImpl() { ...@@ -80,14 +80,13 @@ bool TestSerialIoHandler::ConfigurePortImpl() {
mojom::SerialDeviceControlSignalsPtr TestSerialIoHandler::GetControlSignals() mojom::SerialDeviceControlSignalsPtr TestSerialIoHandler::GetControlSignals()
const { const {
mojom::SerialDeviceControlSignalsPtr signals( auto signals = mojom::SerialDeviceControlSignals::New();
mojom::SerialDeviceControlSignals::New());
*signals = device_control_signals_; *signals = device_control_signals_;
return signals; return signals;
} }
mojom::SerialConnectionInfoPtr TestSerialIoHandler::GetPortInfo() const { mojom::SerialConnectionInfoPtr TestSerialIoHandler::GetPortInfo() const {
mojom::SerialConnectionInfoPtr info(mojom::SerialConnectionInfo::New()); auto info = mojom::SerialConnectionInfo::New();
*info = info_; *info = info_;
return info; return info;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment