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

ash/shelf/shelf_layout_manager_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 "ash/shelf/shelf_layout_manager.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_controller.h"
@@ skipping 691 matching lines @@
   // Run the animation to completion.
   StepWidgetLayerAnimatorToEnd(shelf);
   StepWidgetLayerAnimatorToEnd(shelf->status_area_widget());
   EXPECT_EQ(SHELF_VISIBLE, manager->visibility_state());
   display = screen->GetDisplayNearestWindow(
       Shell::GetPrimaryRootWindow());
   EXPECT_EQ(shelf_height, display.GetWorkAreaInsets().bottom());
 
   // 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());

[James Cook, 2013/08/22 00:19:12]

nit: align indent

[Harry McCleave, 2013/08/27 00:37:00]

Done.

   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());

[James Cook, 2013/08/22 00:19:12]

nit: align indent

[Harry McCleave, 2013/08/27 00:37:00]

Done.

 }
 
 // Makes sure LayoutShelf invoked while animating cleans things up.
 TEST_F(ShelfLayoutManagerTest, LayoutShelfWhileAnimating) {
   ShelfWidget* shelf = GetShelfWidget();
   // Force an initial layout.
   shelf->shelf_layout_manager()->LayoutShelf();
   EXPECT_EQ(SHELF_VISIBLE, shelf->shelf_layout_manager()->visibility_state());
 
   // Hide the shelf.
@@ skipping 1094 matching lines @@
   scoped_ptr<aura::Window> w1(CreateTestWindow());
   w1->Show();
   wm::ActivateWindow(w1.get());
   EXPECT_EQ(SHELF_BACKGROUND_OVERLAP, GetShelfWidget()->GetBackgroundType());
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   EXPECT_EQ(SHELF_BACKGROUND_OVERLAP, GetShelfWidget()->GetBackgroundType());
 }
 
 }  // namespace internal
 }  // namespace ash