Clean up potentially leaky use of base::DeletePointer.

device/hid/hid_service.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.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 27 matching lines @@
     scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) {
   if (g_service == NULL) {
 #if defined(OS_LINUX) && defined(USE_UDEV)
     g_service = new HidServiceLinux(file_task_runner);
 #elif defined(OS_MACOSX)
     g_service = new HidServiceMac(file_task_runner);
 #elif defined(OS_WIN)
     g_service = new HidServiceWin(file_task_runner);
 #endif
     if (g_service != nullptr) {
+      scoped_ptr<HidService> owned_service(g_service);
       base::AtExitManager::RegisterTask(base::Bind(
-          &base::DeletePointer<HidService>, base::Unretained(g_service)));
+          &base::DeletePointer<HidService>, base::Passed(&owned_service)));
     }
   }
   return g_service;
 }
 
 void HidService::SetInstanceForTest(HidService* instance) {
   DCHECK(!g_service);
   g_service = instance;
+  scoped_ptr<HidService> owned_service(instance);
   base::AtExitManager::RegisterTask(base::Bind(&base::DeletePointer<HidService>,
-                                               base::Unretained(g_service)));
+                                               base::Passed(&owned_service)));
 }
 
 void HidService::GetDevices(const GetDevicesCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (enumeration_ready_) {
     std::vector<scoped_refptr<HidDeviceInfo>> devices;
     for (const auto& map_entry : devices_) {
       devices.push_back(map_entry.second);
     }
     base::MessageLoop::current()->PostTask(FROM_HERE,
@@ skipping 71 matching lines @@
     }
 
     for (const GetDevicesCallback& callback : pending_enumerations_) {
       callback.Run(devices);
     }
     pending_enumerations_.clear();
   }
 }
 
 }  // namespace device