ash: Remove ash::Shelf in favor of ash::WmShelf

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_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_view.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_md_test_base.h"
 #include "ash/test/ash_test_helper.h"
-#include "ash/test/shelf_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/display.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
@@ skipping 143 matching lines @@
 // 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");
 
-  ShelfWidget* shelf_widget = nullptr;
-  Shell::RootWindowControllerList controllers(
-      Shell::GetAllRootWindowControllers());
-  for (Shell::RootWindowControllerList::const_iterator i = controllers.begin();
-       i != controllers.end(); ++i) {
-    if (!(*i)->shelf_widget()->shelf()) {
-      shelf_widget = (*i)->shelf_widget();
-      break;
-    }
-  }
-  ASSERT_TRUE(shelf_widget);
+  // 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);
+
+  // Both shelf controllers have a shelf widget.
+  ShelfWidget* shelf_widget1 = shelf1->shelf_widget();
+  ShelfWidget* shelf_widget2 = shelf2->shelf_widget();
+  ASSERT_TRUE(shelf_widget1);
+  ASSERT_TRUE(shelf_widget2);
 
   SetUserLoggedIn(true);
   Shell::GetInstance()->CreateShelf();
 
-  Shelf* shelf = shelf_widget->shelf();
-  ASSERT_TRUE(shelf);
+  // The shelf view and status area horizontally fill the shelf widget.
+  const int status_width1 =
+      shelf_widget1->status_area_widget()->GetWindowBoundsInScreen().width();
+  EXPECT_GT(status_width1, 0);
+  EXPECT_EQ(shelf_widget1->GetContentsView()->width(),
+            shelf1->GetShelfViewForTesting()->width() + status_width1);
 
-  const int status_width =
-      shelf_widget->status_area_widget()->GetWindowBoundsInScreen().width();
-  EXPECT_GT(status_width, 0);
-  EXPECT_EQ(status_width, shelf_widget->GetContentsView()->width() -
-                              test::ShelfTestAPI(shelf).shelf_view()->width());
+  const int status_width2 =
+      shelf_widget2->status_area_widget()->GetWindowBoundsInScreen().width();
+  EXPECT_GT(status_width2, 0);
+  EXPECT_EQ(shelf_widget2->GetContentsView()->width(),
+            shelf2->GetShelfViewForTesting()->width() + status_width2);
 }
 
 // Tests that the shelf lets mouse-events close to the edge fall through to the
 // window underneath.
 TEST_P(ShelfWidgetTest, ShelfEdgeOverlappingWindowHitTestMouse) {
   if (!SupportsHostWindowResize())
     return;
 
   UpdateDisplay("400x400");
   ShelfWidget* shelf_widget = GetShelfWidget();
@@ skipping 270 matching lines @@
 }
 
 TEST_P(ShelfWidgetTestWithDelegate, 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