CrOS Shelf: Enable scrollable shelf by default

Bug: 1009638
Change-Id: I2f0671524fb3d0be94a5c2123b3273f738ffefb1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2093222Reviewed-by: Andrew Xu <andrewxu@chromium.org>
Commit-Queue: Manu Cornet <manucornet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748396}

ash/shelf/shelf_view_unittest.cc

@@ -1199,8 +1199,10 @@ TEST_F(ShelfViewTest, ShouldHideTooltipWithAppListWindowTest) {
 // Test that by moving the mouse cursor off the button onto the bubble it closes
 // the bubble.
 TEST_P(HotseatShelfViewTest, ShouldHideTooltipWhenHoveringOnTooltip) {
-  if (chromeos::switches::ShouldShowShelfHotseat())
+  if (chromeos::switches::ShouldShowShelfHotseat() ||
+      chromeos::switches::ShouldShowScrollableShelf()) {
     return;
+  }
   ShelfTooltipManager* tooltip_manager = test_api_->tooltip_manager();
   tooltip_manager->set_timer_delay_for_test(0);
   ui::test::EventGenerator* generator = GetEventGenerator();

chromeos/constants/chromeos_features.cc

@@ -252,7 +252,7 @@ const base::Feature kSessionManagerLongKillTimeout{
 
 // Enables or disables the scrollable shelf.
 const base::Feature kShelfScrollable{"ShelfScrollable",
-                                     base::FEATURE_DISABLED_BY_DEFAULT};
+                                     base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Enables or disables the shelf hotseat.
 const base::Feature kShelfHotseat{"ShelfHotseat",