Fix mouse lock on chromeos

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/test_activation_delegate.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/cursor_manager.h"
@@ skipping 571 matching lines @@
 }
 
 // We should show and hide the cursor in response to mouse and touch events as
 // requested.
 TEST_F(WindowManagerTest, UpdateCursorVisibility) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
   root_window->SetBounds(gfx::Rect(0, 0, 500, 500));
   scoped_ptr<aura::Window> window(aura::test::CreateTestWindow(
       SK_ColorWHITE, -1, gfx::Rect(0, 0, 500, 500), NULL));
 
-  aura::shared::CompoundEventFilter* env_filter =
-      Shell::GetInstance()->env_filter();
   ash::CursorManager* cursor_manager =
       ash::Shell::GetInstance()->cursor_manager();
 
   ui::MouseEvent mouse_moved(
       ui::ET_MOUSE_MOVED, gfx::Point(0, 0), gfx::Point(0, 0), 0x0);
   ui::TouchEvent touch_pressed1(
       ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, getTime());
   ui::TouchEvent touch_pressed2(
       ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 1, getTime());
 
-  env_filter->set_update_cursor_visibility(true);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->cursor_visible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed1);
   EXPECT_FALSE(cursor_manager->cursor_visible());
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->cursor_visible());
 
-  env_filter->set_update_cursor_visibility(false);
+  // If someone else made cursor invisible keep it invisible even after it
+  // received mouse events.
   cursor_manager->ShowCursor(false);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_FALSE(cursor_manager->cursor_visible());
+  root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);
+  EXPECT_FALSE(cursor_manager->cursor_visible());
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
+  EXPECT_FALSE(cursor_manager->cursor_visible());
+
+  // Back to normal.
   cursor_manager->ShowCursor(true);
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
+  EXPECT_TRUE(cursor_manager->cursor_visible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);
+  EXPECT_FALSE(cursor_manager->cursor_visible());
+  root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->cursor_visible());
 }
 
 }  // namespace ash