Allow setting different hit test bounds overrides for mouse and touch

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 576 matching lines @@
   scoped_ptr<Window> parent(
       CreateTestWindow(SK_ColorWHITE, 1, gfx::Rect(10, 20, 400, 500),
                        root_window()));
   scoped_ptr<Window> child(
       CreateTestWindow(SK_ColorRED, 2, gfx::Rect(0, 0, 60, 70), parent.get()));
   EXPECT_EQ(child.get(), parent->GetEventHandlerForPoint(gfx::Point(0, 0)));
   EXPECT_EQ(child.get(), parent->GetEventHandlerForPoint(gfx::Point(1, 1)));
 
   // We can override the hit test bounds of the parent to make the parent grab
   // events along that edge.
-  parent->set_hit_test_bounds_override_inner(gfx::Insets(1, 1, 1, 1));
+  parent->SetHitTestBoundsOverrideInner(gfx::Insets(1, 1, 1, 1),
+                                        gfx::Insets(1, 1, 1, 1));
   EXPECT_EQ(parent.get(), parent->GetEventHandlerForPoint(gfx::Point(0, 0)));
   EXPECT_EQ(child.get(),  parent->GetEventHandlerForPoint(gfx::Point(1, 1)));
 }
 
 TEST_F(WindowTest, GetEventHandlerForPointWithOverrideDescendingOrder) {
   scoped_ptr<SelfEventHandlingWindowDelegate> parent_delegate(
       new SelfEventHandlingWindowDelegate);
   scoped_ptr<Window> parent(CreateTestWindowWithDelegate(
       parent_delegate.get(), 1, gfx::Rect(10, 20, 400, 500), root_window()));
   scoped_ptr<Window> child(
@@ skipping 2622 matching lines @@
   parent->AddTransientChild(transient);
   parent.reset();
 
   ASSERT_EQ(2u, destruction_order.size());
   EXPECT_EQ("transient", destruction_order[0]);
   EXPECT_EQ("parent", destruction_order[1]);
 }
 
 }  // namespace test
 }  // namespace aura