aura-touch: Refactor some code so that both cros and win-aura can share some code.

content/browser/renderer_host/render_widget_host_view_aura.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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 1560 matching lines @@
   if (window_->parent()->delegate())
     window_->parent()->delegate()->OnMouseEvent(event);
 
   // Return true so that we receive released/drag events.
   return ui::ER_HANDLED;
 }
 
 ui::EventResult RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) {
   TRACE_EVENT0("browser", "RenderWidgetHostViewAura::OnTouchEvent");
   // Update the touch event first.
-  WebKit::WebTouchPoint* point = UpdateWebTouchEvent(event,
-      &touch_event_);
+  WebKit::WebTouchPoint* point = UpdateWebTouchEventFromUIEvent(event,
+                                                                &touch_event_);
 
   // Forward the touch event only if a touch point was updated, and there's a
   // touch-event handler in the page, and no other touch-event is in the queue.
   ui::EventResult result = ui::ER_UNHANDLED;
   if (point) {
     if (host_->ShouldForwardTouchEvent()) {
       host_->ForwardTouchEvent(touch_event_);
       result = ui::ER_CONSUMED;
     }
     UpdateWebTouchEventAfterDispatch(&touch_event_, point);
@@ skipping 323 matching lines @@
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewAura(widget);
 }
 
 // static
 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content