ash:Shelf - Enable Alternate Shelf and Side Shelf by default.

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 e44fe347a6885d03fd1e20adaea7bf784794a826..6121845945006f19deb45da3ba45463d84b3950d 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -709,14 +709,11 @@ TEST_F(ShelfLayoutManagerTest, MAYBE_SetVisible) {
 
   // Make sure the bounds of the two widgets changed.
   launcher_bounds = shelf->GetNativeView()->bounds();
-  int bottom =
-      screen->GetPrimaryDisplay().bounds().bottom() - shelf_height;
-  EXPECT_EQ(launcher_bounds.y(),
-            bottom + (manager->GetIdealBounds().height() -
-                      launcher_bounds.height()) / 2);
+  EXPECT_LT(launcher_bounds.y(),
+            screen->GetPrimaryDisplay().bounds().bottom());
   status_bounds = shelf->status_area_widget()->GetNativeView()->bounds();
-  EXPECT_EQ(status_bounds.y(),
-            bottom + shelf_height - status_bounds.height());
+  EXPECT_LT(status_bounds.y(),
+            screen->GetPrimaryDisplay().bounds().bottom());
 }
 
 // Makes sure LayoutShelf invoked while animating cleans things up.