Remove MessageLoop destruction observer from hid_connection_linux.cc

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 <stdint.h>
 
 #include <limits>
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/files/scoped_file.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "components/device_event_log/device_event_log.h"
@@ skipping 17 matching lines @@
 const char kHIDName[] = "HID_NAME";
 const char kHIDUnique[] = "HID_UNIQ";
 const char kSysfsReportDescriptorKey[] = "report_descriptor";
 
 }  // namespace
 
 struct HidServiceLinux::ConnectParams {
   ConnectParams(scoped_refptr<HidDeviceInfoLinux> device_info,
                 const ConnectCallback& callback,
                 scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-                scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
-      : device_info(device_info),
+                scoped_refptr<base::SequencedTaskRunner> file_task_runner)
+      : device_info(std::move(device_info)),
         callback(callback),
-        task_runner(task_runner),
-        file_task_runner(file_task_runner) {}
+        task_runner(std::move(task_runner)),
+        file_task_runner(std::move(file_task_runner)) {}
   ~ConnectParams() {}
 
   scoped_refptr<HidDeviceInfoLinux> device_info;
   ConnectCallback callback;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner;
-  scoped_refptr<base::SingleThreadTaskRunner> file_task_runner;
-  base::File device_file;
+  scoped_refptr<base::SequencedTaskRunner> file_task_runner;

[robliao, 2017/04/07 01:08:24]

Rename to blocking_task_runner to harmonize with HidConnectionLinux. Same with
below.

[Reilly Grant (use Gerrit), 2017/04/07 22:10:49]

Done.

+  base::ScopedFD fd;
 };
 
 class HidServiceLinux::FileThreadHelper : public DeviceMonitorLinux::Observer {
  public:
   FileThreadHelper(base::WeakPtr<HidServiceLinux> service,
                    scoped_refptr<base::SingleThreadTaskRunner> task_runner)
       : observer_(this), service_(service), task_runner_(task_runner) {
     thread_checker_.DetachFromThread();
   }
 
@@ skipping 172 matching lines @@
                               base::Bind(&HidServiceLinux::OpenOnBlockingThread,
                                          base::Passed(&params)));
 #endif  // defined(OS_CHROMEOS)
 }
 
 #if defined(OS_CHROMEOS)
 
 // static
 void HidServiceLinux::OnPathOpenComplete(std::unique_ptr<ConnectParams> params,
                                          base::ScopedFD fd) {
-  scoped_refptr<base::SingleThreadTaskRunner> file_task_runner =
+  scoped_refptr<base::SequencedTaskRunner> file_task_runner =
       params->file_task_runner;
-  params->device_file = base::File(fd.release());
+  params->fd = std::move(fd);
   file_task_runner->PostTask(FROM_HERE, base::Bind(&HidServiceLinux::FinishOpen,
                                                    base::Passed(&params)));
 }
 
 // static
 void HidServiceLinux::OnPathOpenError(const std::string& device_path,
                                       const ConnectCallback& callback,
                                       const std::string& error_name,
                                       const std::string& error_message) {
   HID_LOG(EVENT) << "Permission broker failed to open '" << device_path
                  << "': " << error_name << ": " << error_message;
   callback.Run(nullptr);
 }
 
 #else
 
 // static
 void HidServiceLinux::OpenOnBlockingThread(
     std::unique_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::File& device_file = params->device_file;
+  base::File 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) {
       HID_LOG(EVENT)
           << "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()) {
     HID_LOG(EVENT) << "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;
   }
-
+  params->fd.reset(device_file.TakePlatformFile());
   FinishOpen(std::move(params));
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 // static
 void HidServiceLinux::FinishOpen(std::unique_ptr<ConnectParams> params) {
   base::ThreadRestrictions::AssertIOAllowed();
   scoped_refptr<base::SingleThreadTaskRunner> task_runner = params->task_runner;
 
-  if (!base::SetNonBlocking(params->device_file.GetPlatformFile())) {
+  if (!base::SetNonBlocking(params->fd.get())) {
     HID_PLOG(ERROR) << "Failed to set the non-blocking flag on the device fd";
     task_runner->PostTask(FROM_HERE, base::Bind(params->callback, nullptr));
     return;
   }
 
   task_runner->PostTask(
       FROM_HERE,
       base::Bind(&HidServiceLinux::CreateConnection, base::Passed(&params)));
 }
 
 // static
 void HidServiceLinux::CreateConnection(std::unique_ptr<ConnectParams> params) {
-  DCHECK(params->device_file.IsValid());
+  DCHECK(params->fd.is_valid());
   params->callback.Run(make_scoped_refptr(new HidConnectionLinux(
-      params->device_info, std::move(params->device_file),
-      params->file_task_runner)));
+      std::move(params->device_info), std::move(params->fd),
+      std::move(params->file_task_runner))));
 }
 
 }  // namespace device