| Index: device/core/device_monitor_win.cc
|
| diff --git a/device/core/device_monitor_win.cc b/device/core/device_monitor_win.cc
|
| index 3449c82350e658b5b93379141946f63a8ce993cc..5048741b45e591ac767cc95b41108b63ccd9425b 100644
|
| --- a/device/core/device_monitor_win.cc
|
| +++ b/device/core/device_monitor_win.cc
|
| @@ -42,8 +42,7 @@ class DeviceMonitorMessageWindow {
|
| 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;
|
| @@ -64,9 +63,10 @@ class DeviceMonitorMessageWindow {
|
| 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() {
|
| }
|
|
|
|
|