Fixed the Touchscreen.TouchEventsEnabled histogram to record the correct values on X11 and Ozone ba…

ui/events/devices/x11/device_data_manager_x11.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/x11/device_data_manager_x11.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 
@@ skipping 115 matching lines @@
 bool DeviceDataManagerX11::IsTouchDataType(const int type) {
   return (type >= kTouchDataTypeStart) && (type <= kTouchDataTypeEnd);
 }
 
 // static
 void DeviceDataManagerX11::CreateInstance() {
   if (instance())
     return;
 
   DeviceDataManagerX11* device_data_manager = new DeviceDataManagerX11();
+
+  // TODO(bruthig): Replace the DeleteInstance callbacks with explicit calls.
   base::AtExitManager::RegisterTask(
-      base::Bind(&base::DeletePointer<DeviceDataManager>, device_data_manager));
+      base::Bind(DeviceDataManager::DeleteInstance));
 
   set_instance(device_data_manager);
 }
 
 // static
 DeviceDataManagerX11* DeviceDataManagerX11::GetInstance() {
   return static_cast<DeviceDataManagerX11*>(DeviceDataManager::GetInstance());
 }
 
 DeviceDataManagerX11::DeviceDataManagerX11()
@@ skipping 628 matching lines @@
     } else {
       keyboards.erase(it);
       ++blocked_iter;
     }
   }
   // Notify base class of updated list.
   DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
 }
 
 }  // namespace ui