Move touchscreen device caching to DeviceDataManager

ui/display/chromeos/touchscreen_delegate_impl.cc

Index: ui/display/chromeos/touchscreen_delegate_impl.cc
diff --git a/ui/display/chromeos/touchscreen_delegate_impl.cc b/ui/display/chromeos/touchscreen_delegate_impl.cc
index dc60e3fb24604d7f3b1d5c7ba3774ff42f16454b..4114756c6f73c2ad29ec726b1e41f9762a43ccf7 100644
--- a/ui/display/chromeos/touchscreen_delegate_impl.cc
+++ b/ui/display/chromeos/touchscreen_delegate_impl.cc
@@ -9,20 +9,20 @@
 
 #include "ui/display/types/chromeos/display_mode.h"
 #include "ui/display/types/chromeos/display_snapshot.h"
-#include "ui/display/types/chromeos/touchscreen_device_manager.h"
+#include "ui/events/device_data_manager.h"
 
 namespace ui {
 
-TouchscreenDelegateImpl::TouchscreenDelegateImpl(
-    scoped_ptr<TouchscreenDeviceManager> touch_device_manager)
-    : touch_device_manager_(touch_device_manager.Pass()) {}
+TouchscreenDelegateImpl::TouchscreenDelegateImpl() {
+}
 
 TouchscreenDelegateImpl::~TouchscreenDelegateImpl() {}
 
 void TouchscreenDelegateImpl::AssociateTouchscreens(
     std::vector<DisplayConfigurator::DisplayState>* displays) {
   std::set<int> no_match_touchscreen;
-  std::vector<TouchscreenDevice> devices = touch_device_manager_->GetDevices();
+  const std::vector<TouchscreenDevice>& devices =
+      DeviceDataManager::GetInstance()->touchscreen_devices();
 
   int internal_touchscreen = -1;
   for (size_t i = 0; i < devices.size(); ++i) {