Move DeviceMonitorLinux to //device/core.

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/location.h"
 #include "base/macros.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"
-#include "device/hid/device_monitor_linux.h"
+#include "device/core/device_monitor_linux.h"
 #include "device/hid/hid_connection_linux.h"
 #include "device/hid/hid_device_info_linux.h"
 #include "device/udev_linux/scoped_udev.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/sys_info.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/permission_broker_client.h"
 #endif  // defined(OS_CHROMEOS)
 
@@ skipping 20 matching lines @@
         file_task_runner(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;
 };
 
-class HidServiceLinux::FileThreadHelper
-    : public DeviceMonitorLinux::Observer,
-      public base::MessageLoop::DestructionObserver {
+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) {}
 
   ~FileThreadHelper() override {
     DCHECK(thread_checker_.CalledOnValidThread());
-    base::MessageLoop::current()->RemoveDestructionObserver(this);
   }
 
   static void Start(std::unique_ptr<FileThreadHelper> self) {
     base::ThreadRestrictions::AssertIOAllowed();
     self->thread_checker_.DetachFromThread();
-    // |self| must be added as a destruction observer first so that it will be
-    // notified before DeviceMonitorLinux.
-    base::MessageLoop::current()->AddDestructionObserver(self.get());
 
     DeviceMonitorLinux* monitor = DeviceMonitorLinux::GetInstance();
     self->observer_.Add(monitor);
     monitor->Enumerate(base::Bind(&FileThreadHelper::OnDeviceAdded,
                                   base::Unretained(self.get())));
     self->task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&HidServiceLinux::FirstEnumerationComplete, self->service_));
 
     // |self| is now owned by the current message loop.
@@ skipping 88 matching lines @@
   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(
           FROM_HERE, base::Bind(&HidServiceLinux::RemoveDevice, service_,
                                 std::string(device_path)));
     }
   }
 
-  // base::MessageLoop::DestructionObserver:
-  void WillDestroyCurrentMessageLoop() override {
+  void WillDestroyMonitorMessageLoop() override {
     DCHECK(thread_checker_.CalledOnValidThread());
     delete this;
   }
 
   base::ThreadChecker thread_checker_;
   ScopedObserver<DeviceMonitorLinux, DeviceMonitorLinux::Observer> observer_;
 
   // This weak pointer is only valid when checked on this task runner.
   base::WeakPtr<HidServiceLinux> service_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
@@ skipping 136 matching lines @@
 
 // static
 void HidServiceLinux::CreateConnection(std::unique_ptr<ConnectParams> params) {
   DCHECK(params->device_file.IsValid());
   params->callback.Run(make_scoped_refptr(new HidConnectionLinux(
       params->device_info, std::move(params->device_file),
       params->file_task_runner)));
 }
 
 }  // namespace device