Remove DeviceMonitorLinux::WillDestroyCurrentMessageLoop().

device/hid/input_service_linux.h

 // 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.
 
 #ifndef DEVICE_HID_INPUT_SERVICE_LINUX_H_
 #define DEVICE_HID_INPUT_SERVICE_LINUX_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 38 matching lines @@
   class Observer {
    public:
     virtual ~Observer() {}
     virtual void OnInputDeviceAdded(const InputDeviceInfo& info) = 0;
     virtual void OnInputDeviceRemoved(const std::string& id) = 0;
   };
 
   InputServiceLinux();
   virtual ~InputServiceLinux();
 
+  // Returns the InputServiceLinux instance for the current process. Creates one
+  // if none has been set.
   static InputServiceLinux* GetInstance();
+
+  // Returns true if an InputServiceLinux instance has been set for the current
+  // process. An instance is set on the first call to GetInstance() or
+  // SetForTesting().
   static bool HasInstance();
-  static void SetForTesting(InputServiceLinux* service);
+
+  // Sets the InputServiceLinux instance for the current process. Cannot be
+  // called if GetInstance() or SetForTesting() has already been called in the
+  // current process. |service| will never be deleted.
+  static void SetForTesting(std::unique_ptr<InputServiceLinux> service);
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Returns list of all currently connected input/hid devices.
   virtual void GetDevices(std::vector<InputDeviceInfo>* devices);
 
   // Returns an info about input device identified by |id|. When there're
   // no input or hid device with such id, returns false and doesn't
   // modify |info|.
   bool GetDeviceInfo(const std::string& id, InputDeviceInfo* info) const;
 
  protected:
   void AddDevice(const InputDeviceInfo& info);
   void RemoveDevice(const std::string& id);
 
   bool CalledOnValidThread() const;
 
   DeviceMap devices_;
   base::ObserverList<Observer> observers_;
 
  private:
-  friend std::default_delete<InputServiceLinux>;
-
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(InputServiceLinux);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_HID_INPUT_SERVICE_LINUX_H_