Clean up potentially leaky use of base::DeletePointer.

ui/events/devices/device_data_manager.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 "ui/events/devices/device_data_manager.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "ui/events/devices/input_device_event_observer.h"
@@ skipping 10 matching lines @@
 
 }  // namespace
 
 // static
 DeviceDataManager* DeviceDataManager::instance_ = NULL;
 
 DeviceDataManager::DeviceDataManager() {
   CHECK(!instance_) << "Can not create multiple instances of DeviceDataManager";
   instance_ = this;
 
+  scoped_ptr<DeviceDataManager> owned_instance(instance_);
   base::AtExitManager::RegisterTask(
-      base::Bind(&base::DeletePointer<DeviceDataManager>, this));
+      base::Bind(&base::DeletePointer<DeviceDataManager>,
+                 base::Passed(&owned_instance)));
 
   ClearTouchDeviceAssociations();
 }
 
 DeviceDataManager::~DeviceDataManager() {
   CHECK_EQ(this, instance_);
   instance_ = NULL;
 }
 
 // static
@@ skipping 135 matching lines @@
 
 void DeviceDataManager::AddObserver(InputDeviceEventObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void DeviceDataManager::RemoveObserver(InputDeviceEventObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace ui