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_unittest.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/basictypes.h"
 #include "base/message_loop.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 129 matching lines @@
   sibling->Show();
   window->parent()->AddChild(sibling.get());
   sibling->Focus();
   ASSERT_TRUE(sibling->HasFocus());
   ASSERT_TRUE(observer.destroyed());
 
   widget_host_ = NULL;
   view_ = NULL;
 }
 
-#if !defined(OS_WIN)
-// Checks that touch-event state is maintained correctly. A lot of the
-// touch-event related functions are not implemented on Windows. So run this
-// test only in chromeos. http://crbug.com/157268
+// Checks that touch-event state is maintained correctly.
 TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
   view_->InitAsChild(NULL);
   view_->Show();
 
   // Start with no touch-event handler in the renderer.
   widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, false));
   EXPECT_FALSE(widget_host_->ShouldForwardTouchEvent());
 
   ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(30, 30), 0,
       base::Time::NowFromSystemTime() - base::Time());
@@ skipping 53 matching lines @@
   EXPECT_EQ(ui::ER_UNHANDLED, view_->OnTouchEvent(&move));
   EXPECT_EQ(WebKit::WebInputEvent::TouchMove, view_->touch_event_.type);
   EXPECT_EQ(1U, view_->touch_event_.touchesLength);
   EXPECT_EQ(WebKit::WebTouchPoint::StateMoved,
             view_->touch_event_.touches[0].state);
 
   EXPECT_EQ(ui::ER_UNHANDLED, view_->OnTouchEvent(&release));
   EXPECT_EQ(WebKit::WebInputEvent::TouchEnd, view_->touch_event_.type);
   EXPECT_EQ(0U, view_->touch_event_.touchesLength);
 }
-#endif // !defined(OS_WIN)
 
 }  // namespace content