chromeos: Remove AshTestBase::SupportsMultipleDisplays

ash/shelf/shelf_widget_unittest.cc

 // Copyright (c) 2013 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/common/shelf/shelf_widget.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_view.h"
@@ skipping 70 matching lines @@
   }
   {
     SCOPED_TRACE("Single Left");
     TestLauncherAlignment(WmShell::Get()->GetPrimaryRootWindow(),
                           SHELF_ALIGNMENT_LEFT,
                           gfx::Rect(kShelfSize, 0, 353 + offset, 400));
   }
 }
 
 TEST_P(ShelfWidgetTest, TestAlignmentForMultipleDisplays) {
-  if (!SupportsMultipleDisplays())
-    return;
-
   // Note that for a left- and right-aligned shelf, this offset must be
   // applied to a maximized window's width rather than its height.
   const int offset = GetMdMaximizedWindowHeightOffset();
   const int kShelfSize = GetShelfConstant(SHELF_SIZE);
   UpdateDisplay("300x300,500x500");
   std::vector<WmWindow*> root_windows = WmShell::Get()->GetAllRootWindows();
   {
     SCOPED_TRACE("Primary Bottom");
     TestLauncherAlignment(root_windows[0], SHELF_ALIGNMENT_BOTTOM,
                           gfx::Rect(0, 0, 300, 253 + offset));
@@ skipping 58 matching lines @@
   params.context = CurrentContext();
   // Widget is now owned by the parent window.
   widget->Init(params);
   widget->SetFullscreen(true);
 }
 
 // Verifies shelf is created with correct size after user login and when its
 // container and status widget has finished sizing.
 // See http://crbug.com/252533
 TEST_P(ShelfWidgetTest, ShelfInitiallySizedAfterLogin) {
-  if (!SupportsMultipleDisplays())
-    return;
-
   SetUserLoggedIn(false);
   UpdateDisplay("300x200,400x300");
 
   // Both displays have a shelf controller.
   std::vector<WmWindow*> roots = WmShell::Get()->GetAllRootWindows();
   WmShelf* shelf1 = WmShelf::ForWindow(roots[0]);
   WmShelf* shelf2 = WmShelf::ForWindow(roots[1]);
   ASSERT_TRUE(shelf1);
   ASSERT_TRUE(shelf2);
 
@@ skipping 249 matching lines @@
 }
 
 TEST_P(ShelfWidgetTestWithInitializer, CreateLockedShelf) {
   // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior.
   TestCreateShelfWithInitialValues(SHELF_ALIGNMENT_BOTTOM_LOCKED,
                                    SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
                                    SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN);
 }
 
 }  // namespace ash