Move |ScopedWebInputEvent| and |WebInputEventTraits| from |content::| to "ui/events/blink"

content/common/input/touch_event_stream_validator.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 "content/common/input/touch_event_stream_validator.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "content/common/input/web_input_event_traits.h"
 #include "content/common/input/web_touch_event_traits.h"
+#include "ui/events/blink/web_input_event_traits.h"
 
 using base::StringPrintf;
 using blink::WebInputEvent;
 using blink::WebTouchEvent;
 using blink::WebTouchPoint;
 
 namespace content {
 namespace {
 
 const WebTouchPoint* FindTouchPoint(const WebTouchEvent& event, int id) {
@@ skipping 33 matching lines @@
 
   WebTouchEvent previous_event = previous_event_;
   previous_event_ = event;
 
   if (!event.touchesLength) {
     error_msg->append("Touch event is empty.\n");
     return false;
   }
 
   if (!WebInputEvent::isTouchEventType(event.type)) {
-    error_msg->append(StringPrintf("Touch event has invalid type: %s\n",
-                                   WebInputEventTraits::GetName(event.type)));
+    error_msg->append(
+        StringPrintf("Touch event has invalid type: %s\n",
+                     ui::WebInputEventTraits::GetName(event.type)));
   }
 
   // Allow "hard" restarting of touch stream validation. This is necessary
   // in cases where touch event forwarding ceases in response to the event ack
   // or removal of touch handlers.
   if (WebTouchEventTraits::IsTouchSequenceStart(event))
     previous_event = WebTouchEvent();
 
   // Unreleased points from the previous event should exist in the latest event.
   for (unsigned i = 0; i < previous_event.touchesLength; ++i) {
@@ skipping 77 matching lines @@
         } else {
           found_valid_state_for_type = true;
         }
         break;
     }
   }
 
   if (!found_valid_state_for_type) {
     error_msg->append(
         StringPrintf("No valid touch point corresponding to event type: %s\n",
-                     WebInputEventTraits::GetName(event.type)));
+                     ui::WebInputEventTraits::GetName(event.type)));
   }
 
   return error_msg->empty();
 }
 
 }  // namespace content