Revert 74518 - Refactor TOUCH_UI to match other refactor....

views/view_unittest.cc

 // Copyright (c) 2010 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 <map>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 397 matching lines @@
 // TouchEvent
 ////////////////////////////////////////////////////////////////////////////////
 bool MockGestureManager::ProcessTouchEventForGesture(
     const TouchEvent& event,
     View* source,
     View::TouchStatus status) {
   if (status != View::TOUCH_STATUS_UNKNOWN) {
     dispatched_synthetic_event_ = false;
     return false;
   }
-  last_touch_event_ =  event.type();
+  last_touch_event_ =  event.GetType();
   last_view_ = source;
   previously_handled_flag_ = status != View::TOUCH_STATUS_UNKNOWN;
   dispatched_synthetic_event_ = true;
   return true;
 }
 
 MockGestureManager::MockGestureManager() {
 }
 
 View::TouchStatus TestView::OnTouchEvent(const TouchEvent& event) {
-  last_touch_event_type_ = event.type();
+  last_touch_event_type_ = event.GetType();
   location_.SetPoint(event.x(), event.y());
   if (!in_touch_sequence_) {
-    if (event.type() == ui::ET_TOUCH_PRESSED) {
+    if (event.GetType() == ui::ET_TOUCH_PRESSED) {
       in_touch_sequence_ = true;
       return TOUCH_STATUS_START;
     }
   } else {
-    if (event.type() == ui::ET_TOUCH_RELEASED) {
+    if (event.GetType() == ui::ET_TOUCH_RELEASED) {
       in_touch_sequence_ = false;
       return TOUCH_STATUS_END;
     }
     return TOUCH_STATUS_CONTINUE;
   }
   return last_touch_event_was_handled_ ? TOUCH_STATUS_CONTINUE :
                                          TOUCH_STATUS_UNKNOWN;
 }
 
 TEST_F(ViewTest, TouchEvent) {
@@ skipping 1059 matching lines @@
 #endif
 }
 
 TEST_F(ViewTest, ChangeNativeViewHierarchyChangeHierarchy) {
   // TODO(georgey): Fix the test for Linux
 #if defined(OS_WIN)
   TestChangeNativeViewHierarchy test(this);
   test.CheckChangingHierarhy();
 #endif
 }