Manage HidService lifetime in DeviceClient implementations.

device/hid/hid_service_win.cc

Index: device/hid/hid_service_win.cc
diff --git a/device/hid/hid_service_win.cc b/device/hid/hid_service_win.cc
index cde47b2a2e02614d41a29c7cf88772d41fa03d13..0af821c83d53472e0168eb3333873098b9bffbd0 100644
--- a/device/hid/hid_service_win.cc
+++ b/device/hid/hid_service_win.cc
@@ -29,13 +29,6 @@
 
 namespace device {
 
-namespace {
-
-void Noop() {
-  // This function does nothing.
-}
-}
-
 HidServiceWin::HidServiceWin(
     scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
     : file_task_runner_(file_task_runner),
@@ -53,6 +46,8 @@ HidServiceWin::HidServiceWin(
                             weak_factory_.GetWeakPtr(), task_runner_));
 }
 
+HidServiceWin::~HidServiceWin() {}
+
 void HidServiceWin::Connect(const HidDeviceId& device_id,
                             const ConnectCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -75,9 +70,6 @@ void HidServiceWin::Connect(const HidDeviceId& device_id,
       base::Bind(callback, new HidConnectionWin(device_info, file.Pass())));
 }
 
-HidServiceWin::~HidServiceWin() {
-}
-
 // static
 void HidServiceWin::EnumerateOnFileThread(
     base::WeakPtr<HidServiceWin> service,
@@ -286,7 +278,7 @@ void HidServiceWin::OnDeviceRemoved(const GUID& class_guid,
   // Execute a no-op closure on the file task runner to synchronize with any
   // devices that are still being enumerated.
   file_task_runner_->PostTaskAndReply(
-      FROM_HERE, base::Bind(&Noop),
+      FROM_HERE, base::Bind(&base::DoNothing),
       base::Bind(&HidServiceWin::RemoveDevice, weak_factory_.GetWeakPtr(),
                  device_path));
 }