Merge 173933

ui/aura/root_window_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 "ui/aura/root_window.h"
 
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/event_client.h"
@@ skipping 126 matching lines @@
   EXPECT_EQ(gfx::Point(1, 1), delegate1->non_client_location());
   // Mouse event was received by target window.
   EXPECT_EQ(1, delegate1->mouse_event_count());
   EXPECT_EQ(0, delegate2->mouse_event_count());
   // Event was in local coordinates.
   EXPECT_EQ(gfx::Point(1, 1), delegate1->mouse_event_location());
   // Non-client flag was set.
   EXPECT_TRUE(delegate1->mouse_event_flags() & ui::EF_IS_NON_CLIENT);
 }
 
-#if defined(OS_WIN)
-// Temporarily disabled for windows. See crbug.com/112222.
-TEST_F(RootWindowTest, DISABLED_HideCursor) {
-#else
-TEST_F(RootWindowTest, HideCursor) {
-#endif  // defined(OS_WIN)
-  scoped_ptr<NonClientDelegate> delegate(new NonClientDelegate());
-  const int kWindowWidth = 123;
-  const int kWindowHeight = 45;
-  gfx::Rect bounds(100, 200, kWindowWidth, kWindowHeight);
-  scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
-      delegate.get(), -1234, bounds, root_window()));
-  aura::Window* window_ptr = &*window;
-
-  root_window()->OnCursorVisibilityChanged(true);
-  // Send a mouse event to window.
-  gfx::Point point(101, 201);
-  gfx::Point local_point;
-  ui::MouseEvent event(ui::ET_MOUSE_MOVED, point, point, 0);
-  root_window()->AsRootWindowHostDelegate()->OnHostMouseEvent(&event);
-
-  // Location was in window.
-  local_point = delegate->mouse_event_location();
-  aura::Window::ConvertPointToTarget(window_ptr, root_window(), &local_point);
-  EXPECT_TRUE(window->bounds().Contains(local_point));
-
-  // Location is now out of window.
-  root_window()->OnCursorVisibilityChanged(false);
-  RunAllPendingInMessageLoop();
-  local_point = delegate->mouse_event_location();
-  aura::Window::ConvertPointToTarget(window_ptr, root_window(), &local_point);
-  EXPECT_FALSE(window->bounds().Contains(local_point));
-
-  // Location is back in window.
-  root_window()->OnCursorVisibilityChanged(true);
-  RunAllPendingInMessageLoop();
-  local_point = delegate->mouse_event_location();
-  aura::Window::ConvertPointToTarget(window_ptr, root_window(), &local_point);
-  EXPECT_TRUE(window->bounds().Contains(local_point));
-}
-
 // Check that we correctly track the state of the mouse buttons in response to
 // button press and release events.
 TEST_F(RootWindowTest, MouseButtonState) {
   EXPECT_FALSE(Env::GetInstance()->is_mouse_button_down());
 
   gfx::Point location;
   scoped_ptr<ui::MouseEvent> event;
 
   // Press the left button.
   event.reset(new ui::MouseEvent(
@@ skipping 564 matching lines @@
 TEST_F(RootWindowTest, GestureRecognizerResetsTargetWhenParentHides) {
   scoped_ptr<Window> w1(CreateWindow(1, root_window(), NULL));
   DetachesParentOnTapDelegate delegate;
   scoped_ptr<Window> parent(CreateWindow(22, w1.get(), NULL));
   Window* child = CreateWindow(11, parent.get(), &delegate);
   test::EventGenerator generator(root_window(), child);
   generator.GestureTapAt(gfx::Point(40, 40));
 }
 
 }  // namespace aura