Allow setting different hit test bounds overrides for mouse and touch

ash/shelf/shelf_layout_manager_unittest.cc

Index: ash/shelf/shelf_layout_manager_unittest.cc
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
index 805df2014ab2f3e961e82e39bd8b76a99a057276..71c2bcdf6128389b59fc3b89b96e55cfe8d3c499 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -23,7 +23,7 @@
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/launcher_test_api.h"
-#include "ash/wm/window_properties.h"
+#include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
@@ -579,9 +579,10 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
   EXPECT_EQ(shelf_hidden.ToString(),
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
 
-  // Enter into fullscreen with minimal chrome (immersive fullscreen).
+  // Enter into immersive fullscreen with minimal chrome (browser fullscreen).
   widget->SetFullscreen(true);
-  window->SetProperty(ash::internal::kFullscreenUsesMinimalChromeKey, true);
+  wm::GetWindowState(window)->SetFullscreenType(
+      ash::wm::FULLSCREEN_TYPE_IMMERSIVE_MINIMAL_CHROME);
   shelf->UpdateVisibilityState();
 
   gfx::Rect bounds_fullscreen = window->bounds();
@@ -613,9 +614,10 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ(bounds_fullscreen.ToString(), window->bounds().ToString());
 
-  // Put the window into fullscreen without any chrome at all (eg tab
-  // fullscreen).
-  window->SetProperty(ash::internal::kFullscreenUsesMinimalChromeKey, false);
+  // Put the window into immersive fullscreen without any chrome at all
+  // (browser immersive fullscreen + tab fullscreen).
+  wm::GetWindowState(window)->SetFullscreenType(
+      ash::wm::FULLSCREEN_TYPE_IMMERSIVE_NO_CHROME);
   shelf->UpdateVisibilityState();
   EXPECT_EQ(SHELF_HIDDEN, shelf->visibility_state());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());