Invoke cursor-hiding logic on touch for Windows

ash/wm/window_manager_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 "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/window_util.h"
@@ skipping 686 matching lines @@
 
   // f1 should get no events since it's out and f2 should get them.
   EXPECT_EQ(0, f1->num_key_events());
   EXPECT_EQ(0, f1->num_mouse_events());
   EXPECT_EQ(1, f2->num_key_events());
   EXPECT_EQ(1, f2->num_mouse_events());
 
   env_filter->RemoveHandler(f2.get());
 }
 
-// A keypress and/or touch only hides the cursor on ChromeOS (crbug.com/304296).
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_WIN)
 // We should show and hide the cursor in response to mouse and touch events as
-// requested.
+// requested. ChromeOS and Windows are the only platforms which hide the cursor
+// in response to touch (crbug.com/322250).
 TEST_F(WindowManagerTest, UpdateCursorVisibility) {
   aura::test::EventGenerator& generator = GetEventGenerator();
   views::corewm::CursorManager* cursor_manager =
       ash::Shell::GetInstance()->cursor_manager();
 
   generator.MoveMouseTo(gfx::Point(0, 0));
   EXPECT_TRUE(cursor_manager->IsCursorVisible());
   EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
   generator.PressTouch();
   EXPECT_FALSE(cursor_manager->IsCursorVisible());
   EXPECT_FALSE(cursor_manager->IsMouseEventsEnabled());
   generator.MoveMouseTo(gfx::Point(0, 0));
   EXPECT_TRUE(cursor_manager->IsCursorVisible());
   EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
   generator.ReleaseTouch();
   EXPECT_TRUE(cursor_manager->IsCursorVisible());
   EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
 }
+#endif  // defined(OS_CHROMEOS) || defined(OS_WIN)
 
+#if defined(OS_CHROMEOS)
+// ChromeOS is the only platform for which the cursor is hidden on both
+// touch and keypress (crbug.com/304296).
 TEST_F(WindowManagerTest, UpdateCursorVisibilityOnKeyEvent) {
   aura::test::EventGenerator& generator = GetEventGenerator();
   views::corewm::CursorManager* cursor_manager =
       ash::Shell::GetInstance()->cursor_manager();
 
   // Pressing a key hides the cursor but does not disable mouse events.
   generator.PressKey(ui::VKEY_A, ui::EF_NONE);
   EXPECT_FALSE(cursor_manager->IsCursorVisible());
   EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
   // Moving mouse shows the cursor.
@@ skipping 63 matching lines @@
   EXPECT_FALSE(observer_a.is_cursor_visible());
 
   // Mouse move should show the cursor.
   observer_a.reset();
   observer_b.reset();
   generator.MoveMouseTo(50, 50);
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_FALSE(observer_b.did_visibility_change());
   EXPECT_TRUE(observer_a.is_cursor_visible());
 }
-#endif
+#endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash