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

content/common/input/gesture_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/gesture_event_stream_validator.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "content/common/input/web_input_event_traits.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "ui/events/blink/web_input_event_traits.h"
 
 using blink::WebInputEvent;
 
 namespace content {
 
 GestureEventStreamValidator::GestureEventStreamValidator()
     : scrolling_(false), pinching_(false), waiting_for_tap_end_(false) {
 }
 
 GestureEventStreamValidator::~GestureEventStreamValidator() {
 }
 
 bool GestureEventStreamValidator::Validate(const blink::WebGestureEvent& event,
                                            std::string* error_msg) {
   DCHECK(error_msg);
   error_msg->clear();
   if (!WebInputEvent::isGestureEventType(event.type)) {
-    error_msg->append(base::StringPrintf(
-        "Invalid gesture type: %s", WebInputEventTraits::GetName(event.type)));
+    error_msg->append(
+        base::StringPrintf("Invalid gesture type: %s",
+                           ui::WebInputEventTraits::GetName(event.type)));
   }
   switch (event.type) {
     case WebInputEvent::GestureScrollBegin:
       if (scrolling_)
         error_msg->append("Scroll begin during scroll\n");
       if (pinching_)
         error_msg->append("Scroll begin during pinch\n");
       scrolling_ = true;
       break;
     case WebInputEvent::GestureScrollUpdate:
@@ skipping 64 matching lines @@
   // 'continuity check', requiring that all events between an initial tap-down
   // and whatever terminates the sequence to have the same source device type,
   // and that touchpad gestures are only found on ScrollEvents.
   if (event.sourceDevice == blink::WebGestureDeviceUninitialized)
     error_msg->append("Gesture event source is uninitialized.\n");
 
   return error_msg->empty();
 }
 
 }  // namespace content