Convert SerialDeviceInfo to a Mojo struct.

device/serial/serial_device_enumerator_linux.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/serial/serial_device_enumerator_linux.h"
 
 #include "base/logging.h"
-#include "base/memory/linked_ptr.h"
 #include "base/strings/string_number_conversions.h"
 
 namespace device {
 
 namespace {
 
 const char kSerialSubsystem[] = "tty";
 
 const char kHostPathKey[] = "DEVNAME";
 const char kHostBusKey[] = "ID_BUS";
@@ skipping 19 matching lines @@
 scoped_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create() {
   return scoped_ptr<SerialDeviceEnumerator>(new SerialDeviceEnumeratorLinux());
 }
 
 SerialDeviceEnumeratorLinux::SerialDeviceEnumeratorLinux() {
   udev_.reset(udev_new());
 }
 
 SerialDeviceEnumeratorLinux::~SerialDeviceEnumeratorLinux() {}
 
-void SerialDeviceEnumeratorLinux::GetDevices(SerialDeviceInfoList* devices) {
-  devices->clear();
-
+mojo::Array<SerialDeviceInfoPtr> SerialDeviceEnumeratorLinux::GetDevices() {
+  mojo::Array<SerialDeviceInfoPtr> devices;
   ScopedUdevEnumeratePtr enumerate(udev_enumerate_new(udev_.get()));
   if (!enumerate) {
     LOG(ERROR) << "Serial device enumeration failed.";
-    return;
+    return devices.Pass();
   }
   if (udev_enumerate_add_match_subsystem(enumerate.get(), kSerialSubsystem)) {
     LOG(ERROR) << "Serial device enumeration failed.";
-    return;
+    return devices.Pass();
   }
   if (udev_enumerate_scan_devices(enumerate.get())) {
     LOG(ERROR) << "Serial device enumeration failed.";
-    return;
+    return devices.Pass();
   }
 
   udev_list_entry* entry = udev_enumerate_get_list_entry(enumerate.get());
   for (; entry != NULL; entry = udev_list_entry_get_next(entry)) {
     ScopedUdevDevicePtr device(udev_device_new_from_syspath(
         udev_.get(), udev_list_entry_get_name(entry)));
     // TODO(rockot): There may be a better way to filter serial devices here,
     // but it's not clear what that would be. Udev will list lots of virtual
     // devices with no real endpoint to back them anywhere. The presence of
     // a bus identifier (e.g., "pci" or "usb") seems to be a good heuristic
     // for detecting actual devices.
     const char* path =
         udev_device_get_property_value(device.get(), kHostPathKey);
     const char* bus = udev_device_get_property_value(device.get(), kHostBusKey);
     if (path != NULL && bus != NULL) {
-      linked_ptr<SerialDeviceInfo> info(new SerialDeviceInfo());
-      info->path = std::string(path);
+      SerialDeviceInfoPtr info(SerialDeviceInfo::New());
+      info->path = mojo::String::From(path);

[darin (slow to review), 2014/06/16 16:59:19]

In this case, since you are converting from |const char*|, you could just use
the mojo::String::operator=(const char*) method.

[Sam McNally, 2014/06/17 07:07:20]

Done.

 
       const char* vendor_id =
           udev_device_get_property_value(device.get(), kVendorIDKey);
       const char* product_id =
           udev_device_get_property_value(device.get(), kProductIDKey);
       const char* product_name =
           udev_device_get_property_value(device.get(), kProductNameKey);
 
       uint32 int_value;
-      if (vendor_id && base::HexStringToUInt(vendor_id, &int_value))
-        info->vendor_id.reset(new uint16(int_value));
-      if (product_id && base::HexStringToUInt(product_id, &int_value))
-        info->product_id.reset(new uint16(int_value));
+      if (vendor_id && base::HexStringToUInt(vendor_id, &int_value)) {
+        info->vendor_id = int_value;
+        info->has_vendor_id = true;
+      }
+      if (product_id && base::HexStringToUInt(product_id, &int_value)) {
+        info->product_id = int_value;
+        info->has_product_id = true;
+      }
       if (product_name)
-        info->display_name.reset(new std::string(product_name));
-
-      devices->push_back(info);
+        info->display_name = mojo::String::From(product_name);

[darin (slow to review), 2014/06/16 16:59:19]

ditto

[Sam McNally, 2014/06/17 07:07:20]

Done.

+      devices.push_back(info.Pass());
     }
   }
+  return devices.Pass();
 }
 
 void SerialDeviceEnumeratorLinux::UdevDeleter::operator()(udev* handle) {
   udev_unref(handle);
 }
 
 }  // namespace device