Clean up potentially leaky use of base::DeletePointer.

device/core/device_monitor_win.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/core/device_monitor_win.h"
 
 #include <dbt.h>
 #include <map>
 #include <windows.h>
 
@@ skipping 24 matching lines @@
 // This singleton class manages a shared message window for all registered
 // device notification observers. It vends one instance of DeviceManagerWin for
 // each unique GUID it sees.
 class DeviceMonitorMessageWindow {
  public:
   static DeviceMonitorMessageWindow* GetInstance() {
     if (!g_message_window) {
       g_message_window = new DeviceMonitorMessageWindow();
       if (g_message_window->Init()) {
         base::AtExitManager::RegisterTask(
-          base::Bind(&base::DeletePointer<DeviceMonitorMessageWindow>,
-                     base::Unretained(g_message_window)));
+            base::Bind(&DeviceMonitorMessageWindow::Delete));
       } else {
         delete g_message_window;
         g_message_window = nullptr;
       }
     }
     return g_message_window;
   }
 
   DeviceMonitorWin* GetForDeviceInterface(const GUID& device_interface) {
     scoped_ptr<DeviceMonitorWin>& device_monitor =
         device_monitors_[device_interface];
     if (!device_monitor) {
       device_monitor.reset(new DeviceMonitorWin());
     }
     return device_monitor.get();
   }
 
   DeviceMonitorWin* GetForAllInterfaces() { return &all_device_monitor_; }
 
  private:
-  friend void base::DeletePointer<DeviceMonitorMessageWindow>(
-      DeviceMonitorMessageWindow* message_window);
-
+  static void Delete() {
+    delete g_message_window;
+    g_message_window = nullptr;
+  }
   DeviceMonitorMessageWindow() {
   }
 
   ~DeviceMonitorMessageWindow() {
     if (notify_handle_) {
       UnregisterDeviceNotification(notify_handle_);
     }
   }
 
   bool Init() {
@@ skipping 114 matching lines @@
                     OnDeviceAdded(class_guid, device_path));
 }
 
 void DeviceMonitorWin::NotifyDeviceRemoved(const GUID& class_guid,
                                            const std::string& device_path) {
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     OnDeviceRemoved(class_guid, device_path));
 }
 
 }  // namespace device