Convert HidDeviceInfo from a struct to a refcounted class.

device/hid/hid_service_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/hid/hid_service_linux.h"
 
 #include <fcntl.h>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 25 matching lines @@
 
 const char kHidrawSubsystem[] = "hidraw";
 const char kHIDID[] = "HID_ID";
 const char kHIDName[] = "HID_NAME";
 const char kHIDUnique[] = "HID_UNIQ";
 const char kSysfsReportDescriptorKey[] = "report_descriptor";
 
 }  // namespace
 
 struct HidServiceLinux::ConnectParams {
-  ConnectParams(const HidDeviceInfo& device_info,
+  ConnectParams(scoped_refptr<HidDeviceInfo> device_info,
                 const ConnectCallback& callback,
                 scoped_refptr<base::SingleThreadTaskRunner> task_runner,
                 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
       : device_info(device_info),
         callback(callback),
         task_runner(task_runner),
         file_task_runner(file_task_runner) {}
   ~ConnectParams() {}
 
-  HidDeviceInfo device_info;
+  scoped_refptr<HidDeviceInfo> device_info;
   ConnectCallback callback;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner;
   scoped_refptr<base::SingleThreadTaskRunner> file_task_runner;
   base::File device_file;
 };
 
 class HidServiceLinux::Helper : public DeviceMonitorLinux::Observer,
                                 public base::MessageLoop::DestructionObserver {
  public:
   Helper(base::WeakPtr<HidServiceLinux> service,
@@ skipping 16 matching lines @@
     DCHECK(thread_checker_.CalledOnValidThread());
     const char* device_path = udev_device_get_syspath(device);
     if (!device_path) {
       return;
     }
     const char* subsystem = udev_device_get_subsystem(device);
     if (!subsystem || strcmp(subsystem, kHidrawSubsystem) != 0) {
       return;
     }
 
-    HidDeviceInfo device_info;
-    device_info.device_id = device_path;
+    scoped_refptr<HidDeviceInfo> device_info(new HidDeviceInfo());
+    device_info->device_id_ = device_path;
 
     const char* str_property = udev_device_get_devnode(device);
     if (!str_property) {
       return;
     }
-    device_info.device_node = str_property;
+    device_info->device_node_ = str_property;
 
     udev_device* parent = udev_device_get_parent(device);
     if (!parent) {
       return;
     }
 
     const char* hid_id = udev_device_get_property_value(parent, kHIDID);
     if (!hid_id) {
       return;
     }
 
     std::vector<std::string> parts;
     base::SplitString(hid_id, ':', &parts);
     if (parts.size() != 3) {
       return;
     }
 
     uint32_t int_property = 0;
     if (HexStringToUInt(base::StringPiece(parts[1]), &int_property)) {
-      device_info.vendor_id = int_property;
+      device_info->vendor_id_ = int_property;
     }
 
     if (HexStringToUInt(base::StringPiece(parts[2]), &int_property)) {
-      device_info.product_id = int_property;
+      device_info->product_id_ = int_property;
     }
 
     str_property = udev_device_get_property_value(parent, kHIDUnique);
     if (str_property != NULL) {
-      device_info.serial_number = str_property;
+      device_info->serial_number_ = str_property;
     }
 
     str_property = udev_device_get_property_value(parent, kHIDName);
     if (str_property != NULL) {
-      device_info.product_name = str_property;
+      device_info->product_name_ = str_property;
     }
 
     const char* parent_sysfs_path = udev_device_get_syspath(parent);
     if (!parent_sysfs_path) {
       return;
     }
     base::FilePath report_descriptor_path =
         base::FilePath(parent_sysfs_path).Append(kSysfsReportDescriptorKey);
     std::string report_descriptor_str;
     if (!base::ReadFileToString(report_descriptor_path,
                                 &report_descriptor_str)) {
       return;
     }
 
     HidReportDescriptor report_descriptor(
         reinterpret_cast<uint8_t*>(&report_descriptor_str[0]),
         report_descriptor_str.length());
-    report_descriptor.GetDetails(
-        &device_info.collections, &device_info.has_report_id,
-        &device_info.max_input_report_size, &device_info.max_output_report_size,
-        &device_info.max_feature_report_size);
+    report_descriptor.GetDetails(&device_info->collections_,
+                                 &device_info->has_report_id_,
+                                 &device_info->max_input_report_size_,
+                                 &device_info->max_output_report_size_,
+                                 &device_info->max_feature_report_size_);
 
     task_runner_->PostTask(FROM_HERE, base::Bind(&HidServiceLinux::AddDevice,
                                                  service_, device_info));
   }
 
   void OnDeviceRemoved(udev_device* device) override {
     DCHECK(thread_checker_.CalledOnValidThread());
     const char* device_path = udev_device_get_syspath(device);
     if (device_path) {
       task_runner_->PostTask(
@@ skipping 40 matching lines @@
 
 void HidServiceLinux::Connect(const HidDeviceId& device_id,
                               const ConnectCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   const auto& map_entry = devices().find(device_id);
   if (map_entry == devices().end()) {
     task_runner_->PostTask(FROM_HERE, base::Bind(callback, nullptr));
     return;
   }
-  const HidDeviceInfo& device_info = map_entry->second;
+  scoped_refptr<HidDeviceInfo> device_info = map_entry->second;
 
   scoped_ptr<ConnectParams> params(new ConnectParams(
       device_info, callback, task_runner_, file_task_runner_));
 
 #if defined(OS_CHROMEOS)
   if (base::SysInfo::IsRunningOnChromeOS()) {
     chromeos::PermissionBrokerClient* client =
         chromeos::DBusThreadManager::Get()->GetPermissionBrokerClient();
     DCHECK(client) << "Could not get permission broker client.";
     if (client) {
       client->RequestPathAccess(
-          device_info.device_node, -1,
+          device_info->device_node(), -1,
           base::Bind(&HidServiceLinux::OnRequestPathAccessComplete,
                      base::Passed(&params)));
     } else {
       task_runner_->PostTask(FROM_HERE, base::Bind(callback, nullptr));
     }
     return;
   }
 #endif  // defined(OS_CHROMEOS)
 
   file_task_runner_->PostTask(
@@ skipping 19 matching lines @@
   } else {
     params->callback.Run(nullptr);
   }
 }
 #endif  // defined(OS_CHROMEOS)
 
 // static
 void HidServiceLinux::OpenDevice(scoped_ptr<ConnectParams> params) {
   base::ThreadRestrictions::AssertIOAllowed();
   scoped_refptr<base::SingleThreadTaskRunner> task_runner = params->task_runner;
-  base::FilePath device_path(params->device_info.device_node);
+  base::FilePath device_path(params->device_info->device_node());
   base::File& device_file = params->device_file;
   int flags =
       base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE;
   device_file.Initialize(device_path, flags);
   if (!device_file.IsValid()) {
     base::File::Error file_error = device_file.error_details();
 
     if (file_error == base::File::FILE_ERROR_ACCESS_DENIED) {
       VLOG(1) << "Access denied opening device read-write, trying read-only.";
       flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
       device_file.Initialize(device_path, flags);
     }
   }
   if (!device_file.IsValid()) {
-    LOG(ERROR) << "Failed to open '" << params->device_info.device_node << "': "
+    LOG(ERROR) << "Failed to open '" << params->device_info->device_node()
+               << "': "
                << base::File::ErrorToString(device_file.error_details());
     task_runner->PostTask(FROM_HERE, base::Bind(params->callback, nullptr));
     return;
   }
 
   int result = fcntl(device_file.GetPlatformFile(), F_GETFL);
   if (result == -1) {
     PLOG(ERROR) << "Failed to get flags from the device file descriptor";
     task_runner->PostTask(FROM_HERE, base::Bind(params->callback, nullptr));
     return;
@@ skipping 12 matching lines @@
 
 // static
 void HidServiceLinux::ConnectImpl(scoped_ptr<ConnectParams> params) {
   DCHECK(params->device_file.IsValid());
   params->callback.Run(make_scoped_refptr(
       new HidConnectionLinux(params->device_info, params->device_file.Pass(),
                              params->file_task_runner)));
 }
 
 }  // namespace device