Remove non-MD test coverage from ShelfLayoutManagerTest

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 47ee97d2fbe8dd2bb3be826a85abf277eaeb4572..7bafd4822bc5e16994deb36c32d8988cacbee0c4 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -7,7 +7,6 @@
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/accelerator_table.h"
 #include "ash/common/focus_cycler.h"
-#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_layout_manager_observer.h"
@@ -170,15 +169,6 @@ class ShelfDragCallback {
       EXPECT_EQ(shelf_widget_bounds_.x(), shelf_bounds.x());
     }
 
-    // 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::IsImmersiveModeMaterial() ||
-        shelf->GetAutoHideState() != ash::SHELF_AUTO_HIDE_HIDDEN) {
-      EXPECT_GE(shelf_bounds.height(),
-                auto_hidden_shelf_widget_bounds_.height());

[tdanderson, 2017/02/08 22:36:53]

Instead of removing this altogether can you replace it with an EXPECT_EQ(height,
0) as per the comment on line 173?

[mohsen, 2017/02/09 06:57:02]

I think I mistakenly removed this check entirely. I should have only removed the
material mode check. Fixed. I also check width in case of vertical shelf. I
don't think a check similar to what you suggested would work however. Per my
tests, shelf height/width is not always zero in for an auto hidden shelf while a
drag gesture is in progress. Also, |auto_hidden_shelf_widget_bounds_.height()|
is 3 even in MD mode. WDYT?

[mohsen, 2017/02/09 21:39:11]

Per offline discussions with tdanderson@, this check is not useful on MD.
|shelf_bounds.height()| can have any non-negative value. So, removed!

-    }
-
     float scroll_delta =
         GetShelfLayoutManager()->PrimaryAxisValue(scroll_.y(), scroll_.x());
     bool increasing_drag =
@@ -510,12 +500,7 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
   gfx::Rect bounds_fullscreen = window->bounds();
   EXPECT_TRUE(widget->IsFullscreen());
 
-  // Shelf hints are removed in immersive full screen mode in MD; and some shelf
-  // hints are shown in non-MD mode.
-  if (ash::MaterialDesignController::IsImmersiveModeMaterial())
-    EXPECT_EQ(bounds_noshelf.ToString(), bounds_fullscreen.ToString());
-  else
-    EXPECT_NE(bounds_noshelf.ToString(), bounds_fullscreen.ToString());
+  EXPECT_EQ(bounds_noshelf.ToString(), bounds_fullscreen.ToString());
 
   // Swipe up. This should show the shelf.
   end = below_start - delta;