Revert "Merge CMTEventData and ValuatorTracker"

ash/touch/touch_observer_hud.cc

 // Copyright (c) 2012 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 "ash/touch/touch_observer_hud.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell_window_ids.h"
@@ skipping 18 matching lines @@
 #include "ui/gfx/transform.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 
-#include "ui/base/x/device_data_manager.h"
+#include "ui/base/x/valuators.h"
 #endif
 
 namespace ash {
 namespace internal {
 
 const int kPointRadius = 20;
 const SkColor kColors[] = {
   SK_ColorYELLOW,
   SK_ColorGREEN,
   SK_ColorRED,
@@ skipping 31 matching lines @@
     default:
       break;
   }
   return "?";
 }
 
 int GetTrackingId(const ui::TouchEvent& event) {
   if (!event.HasNativeEvent())
     return 0;
 #if defined(USE_XI2_MT)
-  ui::DeviceDataManager* manager = ui::DeviceDataManager::GetInstance();
+  ui::ValuatorTracker* valuators = ui::ValuatorTracker::GetInstance();
   double tracking_id;
-  if (manager->GetEventData(*event.native_event(),
-                            ui::DeviceDataManager::DT_TOUCH_TRACKING_ID,
-                            &tracking_id)) {
+  if (valuators->ExtractValuator(*event.native_event(),
+                                 ui::ValuatorTracker::VAL_TRACKING_ID,
+                                 &tracking_id)) {
     return static_cast<int>(tracking_id);
   }
 #endif
   return 0;
 }
 
 int GetSourceDeviceId(const ui::TouchEvent& event) {
   if (!event.HasNativeEvent())
     return 0;
 #if defined(USE_X11)
@@ skipping 617 matching lines @@
                           internal::kShellWindowId_OverlayContainer));
 
   RootWindowController* controller = GetRootWindowController(root_window_);
   controller->set_touch_observer_hud(this);
 
   root_window_->AddPreTargetHandler(this);
 }
 
 }  // namespace internal
 }  // namespace ash