Fix tests in ShelfLayoutManagerTest when MD is enable

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/aura/wm_window_aura.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/focus_cycler.h"
+#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
@@ skipping 110 matching lines @@
   gfx::Rect target_bounds_;
   int animation_steps_;
   bool done_waiting_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfAnimationWaiter);
 };
 
 class ShelfDragCallback {
  public:
   ShelfDragCallback(const gfx::Rect& not_visible, const gfx::Rect& visible)
-      : not_visible_bounds_(not_visible),
-        visible_bounds_(visible),
+      : auto_hidden_shelf_widget_bounds_(not_visible),

[James Cook, 2016/07/14 22:59:13]

These names are much clearer. Thanks for changing them.

+        shelf_widget_bounds_(visible),
         was_visible_on_drag_start_(false) {
-    EXPECT_EQ(not_visible_bounds_.bottom(), visible_bounds_.bottom());
+    EXPECT_EQ(auto_hidden_shelf_widget_bounds_.bottom(),
+              shelf_widget_bounds_.bottom());
   }
 
   virtual ~ShelfDragCallback() {}
 
   void ProcessScroll(ui::EventType type, const gfx::Vector2dF& delta) {
     if (GetShelfLayoutManager()->visibility_state() == SHELF_HIDDEN)
       return;
 
     if (type == ui::ET_GESTURE_SCROLL_BEGIN) {
       scroll_ = gfx::Vector2dF();
       was_visible_on_drag_start_ = GetShelfLayoutManager()->IsVisible();
       return;
     }
 
     // The state of the shelf at the end of the gesture is tested separately.
     if (type == ui::ET_GESTURE_SCROLL_END)
       return;
 
     if (type == ui::ET_GESTURE_SCROLL_UPDATE)
       scroll_.Add(delta);
 
     gfx::Rect shelf_bounds = GetShelfWidget()->GetWindowBoundsInScreen();
     if (GetShelfLayoutManager()->IsHorizontalAlignment()) {
-      EXPECT_EQ(not_visible_bounds_.bottom(), shelf_bounds.bottom());
-      EXPECT_EQ(visible_bounds_.bottom(), shelf_bounds.bottom());
+      EXPECT_EQ(auto_hidden_shelf_widget_bounds_.bottom(),
+                shelf_bounds.bottom());
+      EXPECT_EQ(shelf_widget_bounds_.bottom(), shelf_bounds.bottom());
     } else if (SHELF_ALIGNMENT_RIGHT ==
                GetShelfLayoutManager()->GetAlignment()) {
-      EXPECT_EQ(not_visible_bounds_.right(), shelf_bounds.right());
-      EXPECT_EQ(visible_bounds_.right(), shelf_bounds.right());
+      EXPECT_EQ(auto_hidden_shelf_widget_bounds_.right(), shelf_bounds.right());
+      EXPECT_EQ(shelf_widget_bounds_.right(), shelf_bounds.right());
     } else if (SHELF_ALIGNMENT_LEFT ==
                GetShelfLayoutManager()->GetAlignment()) {
-      EXPECT_EQ(not_visible_bounds_.x(), shelf_bounds.x());
-      EXPECT_EQ(visible_bounds_.x(), shelf_bounds.x());
+      EXPECT_EQ(auto_hidden_shelf_widget_bounds_.x(), shelf_bounds.x());
+      EXPECT_EQ(shelf_widget_bounds_.x(), shelf_bounds.x());
     }
 
     // if the shelf is being dimmed test dimmer bounds as well.
     if (GetShelfWidget()->GetDimsShelf())
       EXPECT_EQ(GetShelfWidget()->GetWindowBoundsInScreen(),
                 GetShelfWidget()->GetDimmerBoundsForTest());
 
-    // The shelf should never be smaller than the hidden state when shelf is
-    // visible; the shelf has a height of 0 when it is hidden.
-    if (was_visible_on_drag_start_)
-      EXPECT_GE(shelf_bounds.height(), not_visible_bounds_.height());
+    // Auto hidden shelf has a visible height of 0 in MD (where this inequality
+    // does not apply); whereas auto hidden shelf has a visible height of 3 in
+    // non-MD.
+    if (!ash::MaterialDesignController::IsShelfMaterial() ||
+        GetShelf()->GetAutoHideState() != ash::SHELF_AUTO_HIDE_HIDDEN) {
+      EXPECT_GE(shelf_bounds.height(),
+                auto_hidden_shelf_widget_bounds_.height());
+    }
+
     float scroll_delta =
         GetShelfLayoutManager()->PrimaryAxisValue(scroll_.y(), scroll_.x());
     bool increasing_drag =
         GetShelfWidget()->shelf()->SelectValueForShelfAlignment(
             scroll_delta<0, scroll_delta> 0, scroll_delta < 0);
     int shelf_size = GetShelfLayoutManager()->PrimaryAxisValue(
         shelf_bounds.height(), shelf_bounds.width());
     int visible_bounds_size = GetShelfLayoutManager()->PrimaryAxisValue(
-        visible_bounds_.height(), visible_bounds_.width());
+        shelf_widget_bounds_.height(), shelf_widget_bounds_.width());
     int not_visible_bounds_size = GetShelfLayoutManager()->PrimaryAxisValue(
-        not_visible_bounds_.height(), not_visible_bounds_.width());
+        auto_hidden_shelf_widget_bounds_.height(),
+        auto_hidden_shelf_widget_bounds_.width());
     if (was_visible_on_drag_start_) {
       if (increasing_drag) {
         // If dragging inwards from the visible state, then the shelf should
         // increase in size, but not more than the scroll delta.
         EXPECT_LE(visible_bounds_size, shelf_size);
         EXPECT_LE(std::abs(shelf_size - visible_bounds_size),
                   std::abs(scroll_delta));
       } else {
         if (shelf_size > not_visible_bounds_size) {
           // If dragging outwards from the visible state, then the shelf
           // should decrease in size, until it reaches the minimum size.
           EXPECT_EQ(shelf_size, visible_bounds_size - std::abs(scroll_delta));
         }
       }
     } else {
       if (std::abs(scroll_delta) <
           visible_bounds_size - not_visible_bounds_size) {
         // Tests that the shelf sticks with the touch point during the drag
         // until the shelf is completely visible.
         EXPECT_EQ(shelf_size, not_visible_bounds_size + std::abs(scroll_delta));
       } else {
         // Tests that after the shelf is completely visible, the shelf starts
         // resisting the drag.
         EXPECT_LT(shelf_size, not_visible_bounds_size + std::abs(scroll_delta));
       }
     }
   }
 
  private:
-  const gfx::Rect not_visible_bounds_;
-  const gfx::Rect visible_bounds_;
+  const gfx::Rect auto_hidden_shelf_widget_bounds_;
+  const gfx::Rect shelf_widget_bounds_;
   gfx::Vector2dF scroll_;
   bool was_visible_on_drag_start_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfDragCallback);
 };
 
 class ShelfLayoutObserverTest : public ShelfLayoutManagerObserver {
  public:
   ShelfLayoutObserverTest() : changed_auto_hide_state_(false) {}
 
@@ skipping 343 matching lines @@
             GetShelfWidget()->GetWindowBoundsInScreen().ToString());
 
   // Put |widget| into fullscreen. Set the shelf to be auto hidden when |widget|
   // is fullscreen. (eg browser immersive fullscreen).
   widget->SetFullscreen(true);
   wm::GetWindowState(window)->set_hide_shelf_when_fullscreen(false);
   layout_manager->UpdateVisibilityState();
 
   gfx::Rect bounds_fullscreen = window->bounds();
   EXPECT_TRUE(widget->IsFullscreen());
-  EXPECT_NE(bounds_noshelf.ToString(), bounds_fullscreen.ToString());
+
+  // Shelf hints are removed in immersive full screen mode in MD; and some shelf
+  // hints are shown in non-MD mode.
+  if (ash::MaterialDesignController::IsShelfMaterial())
+    EXPECT_EQ(bounds_noshelf.ToString(), bounds_fullscreen.ToString());
+  else
+    EXPECT_NE(bounds_noshelf.ToString(), bounds_fullscreen.ToString());
 
   // Swipe up. This should show the shelf.
   end = below_start - delta;
   generator.GestureScrollSequenceWithCallback(
       below_start, end, kTimeDelta, kNumScrollSteps,
       base::Bind(&ShelfDragCallback::ProcessScroll,
                  base::Unretained(&handler)));
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_NEVER, shelf->auto_hide_behavior());
@@ skipping 200 matching lines @@
   widget->Init(params);
   widget->Maximize();
   widget->Show();
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState());
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
 
   // LayoutShelf() forces the animation to completion, at which point the
   // shelf should go off the screen.
   layout_manager->LayoutShelf();
   int shelf_insets = GetShelfConstant(SHELF_INSETS_FOR_AUTO_HIDE);
-  EXPECT_EQ(root->bounds().bottom() - shelf_insets,
+
+  EXPECT_EQ(root->bounds().bottom() - kShelfAutoHideSize,
             GetShelfWidget()->GetWindowBoundsInScreen().y());
   EXPECT_EQ(root->bounds().bottom() - shelf_insets,
             display::Screen::GetScreen()
                 ->GetDisplayNearestWindow(root)
                 .work_area()
                 .bottom());
 
   // Move the mouse to the bottom of the screen.
   generator.MoveMouseTo(0, root->bounds().bottom() - 1);
 
   // Shelf should be shown again (but it shouldn't have changed the work area).
   SetState(layout_manager, SHELF_AUTO_HIDE);
   EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->GetAutoHideState());
   layout_manager->LayoutShelf();
   EXPECT_EQ(root->bounds().bottom() - layout_manager->GetIdealBounds().height(),
             GetShelfWidget()->GetWindowBoundsInScreen().y());
-  EXPECT_EQ(root->bounds().bottom() - kShelfAutoHideSize,
+  EXPECT_EQ(root->bounds().bottom() - shelf_insets,
             display::Screen::GetScreen()
                 ->GetDisplayNearestWindow(root)
                 .work_area()
                 .bottom());
 
   // Move mouse back up.
   generator.MoveMouseTo(0, 0);
   SetState(layout_manager, SHELF_AUTO_HIDE);
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
   layout_manager->LayoutShelf();
@@ skipping 853 matching lines @@
   EXPECT_EQ(layout_manager->GetIdealBounds().width(),
             display.GetWorkAreaInsets().right());
   EXPECT_EQ(0, display.GetWorkAreaInsets().top());
   EXPECT_EQ(0, display.GetWorkAreaInsets().bottom());
   EXPECT_EQ(0, display.GetWorkAreaInsets().left());
   EXPECT_EQ(display.work_area().right(), shelf_bounds.x());
   EXPECT_EQ(display.bounds().y(), shelf_bounds.y());
   EXPECT_EQ(display.bounds().height(), shelf_bounds.height());
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   display = screen->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
-  EXPECT_EQ(kShelfAutoHideSize, display.GetWorkAreaInsets().right());
-  EXPECT_EQ(kShelfAutoHideSize,
+  EXPECT_EQ(GetShelfConstant(SHELF_INSETS_FOR_AUTO_HIDE),
+            display.GetWorkAreaInsets().right());
+  EXPECT_EQ(GetShelfConstant(SHELF_INSETS_FOR_AUTO_HIDE),
             display.bounds().right() - display.work_area().right());
 }
 
 TEST_F(ShelfLayoutManagerTest, GestureEdgeSwipe) {
   Shelf* shelf = GetShelf();
   ShelfLayoutManager* layout_manager = GetShelfLayoutManager();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.bounds = gfx::Rect(0, 0, 200, 200);
@@ skipping 546 matching lines @@
                                              ->shelf_widget()
                                              ->status_area_widget();
   EXPECT_TRUE(status_area_widget->IsVisible());
   // Shelf should be in the first display's area.
   gfx::Rect status_area_bounds(status_area_widget->GetWindowBoundsInScreen());
   EXPECT_TRUE(gfx::Rect(0, 0, 500, 400).Contains(status_area_bounds));
   EXPECT_EQ(gfx::Point(500, 400), status_area_bounds.bottom_right());
 }
 
 }  // namespace ash