aura: Make Window::HitTest() a private method.

ui/aura/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/window.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 452 matching lines @@
 #if !defined(OS_WIN)
   // TODO(yoshiki): fix this to build on Windows. See crbug.com/133413.
   gfx::Point mouse_location;
   EXPECT_TRUE(dispatcher()->host()->QueryMouseLocation(&mouse_location));
   EXPECT_EQ("169,80", mouse_location.ToString());
 #endif
   EXPECT_EQ("20,53",
       gfx::Screen::GetScreenFor(root)->GetCursorScreenPoint().ToString());
 }
 
-TEST_F(WindowTest, HitTest) {
-  Window w1(new ColorTestWindowDelegate(SK_ColorWHITE));
-  w1.set_id(1);
-  w1.Init(aura::WINDOW_LAYER_TEXTURED);
-  w1.SetBounds(gfx::Rect(10, 20, 50, 60));
-  w1.Show();
-  ParentWindow(&w1);
-
-  // Points are in the Window's coordinates.
-  EXPECT_TRUE(w1.HitTest(gfx::Point(1, 1)));
-  EXPECT_FALSE(w1.HitTest(gfx::Point(-1, -1)));
-
-  // TODO(beng): clip Window to parent.
-}
-
-TEST_F(WindowTest, HitTestMask) {
-  MaskedWindowDelegate d1(gfx::Rect(5, 6, 20, 30));
-  Window w1(&d1);
-  w1.Init(aura::WINDOW_LAYER_NOT_DRAWN);
-  w1.SetBounds(gfx::Rect(10, 20, 50, 60));
-  w1.Show();
-  ParentWindow(&w1);
-
-  // Points inside the mask.
-  EXPECT_TRUE(w1.HitTest(gfx::Point(5, 6)));  // top-left
-  EXPECT_TRUE(w1.HitTest(gfx::Point(15, 21)));  // center
-  EXPECT_TRUE(w1.HitTest(gfx::Point(24, 35)));  // bottom-right
-
-  // Points outside the mask.
-  EXPECT_FALSE(w1.HitTest(gfx::Point(0, 0)));
-  EXPECT_FALSE(w1.HitTest(gfx::Point(60, 80)));
-  EXPECT_FALSE(w1.HitTest(gfx::Point(4, 6)));
-  EXPECT_FALSE(w1.HitTest(gfx::Point(5, 5)));
-  EXPECT_FALSE(w1.HitTest(gfx::Point(25, 36)));
-}
-
 TEST_F(WindowTest, GetEventHandlerForPoint) {
   scoped_ptr<Window> w1(
       CreateTestWindow(SK_ColorWHITE, 1, gfx::Rect(10, 10, 500, 500),
                        root_window()));
   scoped_ptr<Window> w11(
       CreateTestWindow(SK_ColorGREEN, 11, gfx::Rect(5, 5, 100, 100), w1.get()));
   scoped_ptr<Window> w111(
       CreateTestWindow(SK_ColorCYAN, 111, gfx::Rect(5, 5, 75, 75), w11.get()));
   scoped_ptr<Window> w1111(
       CreateTestWindow(SK_ColorRED, 1111, gfx::Rect(5, 5, 50, 50), w111.get()));
@@ skipping 2804 matching lines @@
               BuildRootLayerTreeDescription(*root.layer()))
         << "layer tree doesn't match at " << i;
     EXPECT_EQ(data[i].expected_description,
               BuildRootWindowTreeDescription(root))
         << "window tree doesn't match at " << i;
   }
 }
 
 }  // namespace test
 }  // namespace aura