| Index: device/serial/serial_device_enumerator_linux.cc
|
| diff --git a/device/serial/serial_device_enumerator_linux.cc b/device/serial/serial_device_enumerator_linux.cc
|
| index 9e308e7abfe4624d78077922626f09b3056ec03a..d4af8306a0fe84d9498121b80d531dd13228f332 100644
|
| --- a/device/serial/serial_device_enumerator_linux.cc
|
| +++ b/device/serial/serial_device_enumerator_linux.cc
|
| @@ -5,6 +5,7 @@
|
| #include "device/serial/serial_device_enumerator_linux.h"
|
|
|
| #include <stdint.h>
|
| +#include <utility>
|
|
|
| #include "base/logging.h"
|
| #include "base/strings/string_number_conversions.h"
|
| @@ -39,15 +40,15 @@ mojo::Array<serial::DeviceInfoPtr> SerialDeviceEnumeratorLinux::GetDevices() {
|
| ScopedUdevEnumeratePtr enumerate(udev_enumerate_new(udev_.get()));
|
| if (!enumerate) {
|
| LOG(ERROR) << "Serial device enumeration failed.";
|
| - return devices.Pass();
|
| + return devices;
|
| }
|
| if (udev_enumerate_add_match_subsystem(enumerate.get(), kSerialSubsystem)) {
|
| LOG(ERROR) << "Serial device enumeration failed.";
|
| - return devices.Pass();
|
| + return devices;
|
| }
|
| if (udev_enumerate_scan_devices(enumerate.get())) {
|
| LOG(ERROR) << "Serial device enumeration failed.";
|
| - return devices.Pass();
|
| + return devices;
|
| }
|
|
|
| udev_list_entry* entry = udev_enumerate_get_list_entry(enumerate.get());
|
| @@ -84,10 +85,10 @@ mojo::Array<serial::DeviceInfoPtr> SerialDeviceEnumeratorLinux::GetDevices() {
|
| }
|
| if (product_name)
|
| info->display_name = product_name;
|
| - devices.push_back(info.Pass());
|
| + devices.push_back(std::move(info));
|
| }
|
| }
|
| - return devices.Pass();
|
| + return devices;
|
| }
|
|
|
| } // namespace device
|
|
|