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

content/common/input/event_with_latency_info.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_COMMON_INPUT_EVENT_WITH_LATENCY_INFO_H_
 #define CONTENT_COMMON_INPUT_EVENT_WITH_LATENCY_INFO_H_
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "content/common/content_export.h"
-#include "content/common/input/scoped_web_input_event.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "ui/events/blink/scoped_web_input_event.h"
 #include "ui/events/latency_info.h"
 
 namespace content {
 namespace internal {
 
 bool CONTENT_EXPORT CanCoalesce(const blink::WebMouseEvent& event_to_coalesce,
                                 const blink::WebMouseEvent& event);
 void CONTENT_EXPORT Coalesce(const blink::WebMouseEvent& event_to_coalesce,
                              blink::WebMouseEvent* event);
 bool CONTENT_EXPORT
 CanCoalesce(const blink::WebMouseWheelEvent& event_to_coalesce,
             const blink::WebMouseWheelEvent& event);
 void CONTENT_EXPORT Coalesce(const blink::WebMouseWheelEvent& event_to_coalesce,
                              blink::WebMouseWheelEvent* event);
 bool CONTENT_EXPORT CanCoalesce(const blink::WebTouchEvent& event_to_coalesce,
                                 const blink::WebTouchEvent& event);
 void CONTENT_EXPORT Coalesce(const blink::WebTouchEvent& event_to_coalesce,
                              blink::WebTouchEvent* event);
 bool CONTENT_EXPORT CanCoalesce(const blink::WebGestureEvent& event_to_coalesce,
                                 const blink::WebGestureEvent& event);
 void CONTENT_EXPORT Coalesce(const blink::WebGestureEvent& event_to_coalesce,
                              blink::WebGestureEvent* event);
 
 }  // namespace internal
 
 class ScopedWebInputEventWithLatencyInfo {
  public:
-  ScopedWebInputEventWithLatencyInfo(ScopedWebInputEvent,
+  ScopedWebInputEventWithLatencyInfo(ui::ScopedWebInputEvent,
                                      const ui::LatencyInfo&);
 
   ~ScopedWebInputEventWithLatencyInfo();
 
   bool CanCoalesceWith(const ScopedWebInputEventWithLatencyInfo& other) const
       WARN_UNUSED_RESULT;
 
   const blink::WebInputEvent& event() const;
   blink::WebInputEvent& event();
   const ui::LatencyInfo latencyInfo() const { return latency_; }
 
   void CoalesceWith(const ScopedWebInputEventWithLatencyInfo& other);
 
  private:
-  ScopedWebInputEvent event_;
+  ui::ScopedWebInputEvent event_;
   mutable ui::LatencyInfo latency_;
 };
 
 template <typename T>
 class EventWithLatencyInfo {
  public:
   T event;
   mutable ui::LatencyInfo latency;
 
   explicit EventWithLatencyInfo(const T& e) : event(e) {}
@@ skipping 38 matching lines @@
 typedef EventWithLatencyInfo<blink::WebMouseWheelEvent>
     MouseWheelEventWithLatencyInfo;
 typedef EventWithLatencyInfo<blink::WebMouseEvent>
     MouseEventWithLatencyInfo;
 typedef EventWithLatencyInfo<blink::WebTouchEvent>
     TouchEventWithLatencyInfo;
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_INPUT_EVENT_WITH_LATENCY_INFO_H_