mash: Convert all of //ash/system to use WmShelf

ash/system/toast/toast_manager_unittest.cc

 // Copyright 2016 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_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
-#include "ash/shelf/shelf.h"
-#include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/system/toast/toast_manager.h"
 #include "ash/test/ash_test_base.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
+#include "ui/views/widget/widget.h"
 
 namespace ash {
 
 class DummyEvent : public ui::Event {
  public:
   DummyEvent() : Event(ui::ET_UNKNOWN, base::TimeTicks(), 0) {}
   ~DummyEvent() override {}
 };
 
 class ToastManagerTest : public test::AshTestBase {
@@ skipping 34 matching lines @@
     ToastOverlay* overlay = GetCurrentOverlay();
     return overlay ? overlay->dismiss_text_ : std::string();
   }
 
   void ClickDismissButton() {
     ToastOverlay* overlay = GetCurrentOverlay();
     if (overlay)
       overlay->ClickDismissButtonForTesting(DummyEvent());
   }
 
-  void SetShelfAlignment(ShelfAlignment alignment) {
-    Shelf::ForPrimaryDisplay()->SetAlignment(alignment);
-  }
-
-  void SetShelfState(ShelfVisibilityState state) {
-    Shelf::ForPrimaryDisplay()->shelf_layout_manager()->SetState(state);
-  }
-
-  void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior) {
-    Shelf::ForPrimaryDisplay()->SetAutoHideBehavior(behavior);
-  }
-
   std::string ShowToast(const std::string& text, int32_t duration) {
     std::string id = "TOAST_ID_" + base::UintToString(serial_++);
     manager()->Show(ToastData(id, text, duration, ""));
     return id;
   }
 
   std::string ShowToastWithDismiss(const std::string& text,
                                    int32_t duration,
                                    const std::string& dismiss_text) {
     std::string id = "TOAST_ID_" + base::UintToString(serial_++);
@@ skipping 62 matching lines @@
 
   EXPECT_EQ("DUMMY2", GetCurrentText());
 
   while (GetToastSerial() != 3)
     base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ("DUMMY3", GetCurrentText());
 }
 
 TEST_F(ToastManagerTest, PositionWithVisibleBottomShelf) {
-  ShelfLayoutManager* shelf =
-      Shelf::ForPrimaryDisplay()->shelf_layout_manager();
-  SetShelfState(ash::SHELF_VISIBLE);
-  SetShelfAlignment(SHELF_ALIGNMENT_BOTTOM);
+  WmShelf* shelf = WmShelf::ForPrimaryDisplay();
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->GetAlignment());
+  EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
 
   ShowToast("DUMMY", ToastData::kInfiniteDuration);
   EXPECT_EQ(1, GetToastSerial());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::Rect root_bounds =
       ScreenUtil::GetShelfDisplayBoundsInRoot(Shell::GetPrimaryRootWindow());
 
-  EXPECT_TRUE(toast_bounds.Intersects(shelf->user_work_area_bounds()));
+  EXPECT_TRUE(toast_bounds.Intersects(shelf->GetUserWorkAreaBounds()));
   EXPECT_NEAR(root_bounds.CenterPoint().x(), toast_bounds.CenterPoint().x(), 1);
 
   if (SupportsHostWindowResize()) {
     // If host resize is not supported, ShelfLayoutManager::GetIdealBounds()
     // doesn't return correct value.
     gfx::Rect shelf_bounds = shelf->GetIdealBounds();
     EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds));
     EXPECT_EQ(shelf_bounds.y() - 5, toast_bounds.bottom());
     EXPECT_EQ(root_bounds.bottom() - shelf_bounds.height() - 5,
               toast_bounds.bottom());
   }
 }
 
 TEST_F(ToastManagerTest, PositionWithAutoHiddenBottomShelf) {
   std::unique_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 3, 4)));
 
-  ShelfLayoutManager* shelf =
-      Shelf::ForPrimaryDisplay()->shelf_layout_manager();
-  SetShelfAlignment(SHELF_ALIGNMENT_BOTTOM);
-  SetShelfAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
-  shelf->LayoutShelf();
-  EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
+  WmShelf* shelf = WmShelf::ForPrimaryDisplay();
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->GetAlignment());
+  shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
+  EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->GetAutoHideState());
 
   ShowToast("DUMMY", ToastData::kInfiniteDuration);
   EXPECT_EQ(1, GetToastSerial());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::Rect root_bounds =
       ScreenUtil::GetShelfDisplayBoundsInRoot(Shell::GetPrimaryRootWindow());
 
-  EXPECT_TRUE(toast_bounds.Intersects(shelf->user_work_area_bounds()));
+  EXPECT_TRUE(toast_bounds.Intersects(shelf->GetUserWorkAreaBounds()));
   EXPECT_NEAR(root_bounds.CenterPoint().x(), toast_bounds.CenterPoint().x(), 1);
   EXPECT_EQ(root_bounds.bottom() - kShelfAutoHideSize - 5,
             toast_bounds.bottom());
 }
 
 TEST_F(ToastManagerTest, PositionWithHiddenBottomShelf) {
-  ShelfLayoutManager* shelf =
-      Shelf::ForPrimaryDisplay()->shelf_layout_manager();
-  SetShelfAutoHideBehavior(SHELF_AUTO_HIDE_ALWAYS_HIDDEN);
-  SetShelfAlignment(SHELF_ALIGNMENT_BOTTOM);
-  SetShelfState(ash::SHELF_HIDDEN);
+  WmShelf* shelf = WmShelf::ForPrimaryDisplay();
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->GetAlignment());
+  shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_ALWAYS_HIDDEN);
+  EXPECT_EQ(SHELF_HIDDEN, shelf->GetVisibilityState());
 
   ShowToast("DUMMY", ToastData::kInfiniteDuration);
   EXPECT_EQ(1, GetToastSerial());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::Rect root_bounds =
       ScreenUtil::GetShelfDisplayBoundsInRoot(Shell::GetPrimaryRootWindow());
 
-  EXPECT_TRUE(toast_bounds.Intersects(shelf->user_work_area_bounds()));
+  EXPECT_TRUE(toast_bounds.Intersects(shelf->GetUserWorkAreaBounds()));
   EXPECT_NEAR(root_bounds.CenterPoint().x(), toast_bounds.CenterPoint().x(), 1);
   EXPECT_EQ(root_bounds.bottom() - 5, toast_bounds.bottom());
 }
 
 TEST_F(ToastManagerTest, PositionWithVisibleLeftShelf) {
-  ShelfLayoutManager* shelf =
-      Shelf::ForPrimaryDisplay()->shelf_layout_manager();
-  SetShelfState(ash::SHELF_VISIBLE);
-  SetShelfAlignment(SHELF_ALIGNMENT_LEFT);
+  WmShelf* shelf = WmShelf::ForPrimaryDisplay();
+  EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
+  shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
 
   ShowToast("DUMMY", ToastData::kInfiniteDuration);
   EXPECT_EQ(1, GetToastSerial());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::Rect root_bounds =
       ScreenUtil::GetShelfDisplayBoundsInRoot(Shell::GetPrimaryRootWindow());
 
-  EXPECT_TRUE(toast_bounds.Intersects(shelf->user_work_area_bounds()));
+  EXPECT_TRUE(toast_bounds.Intersects(shelf->GetUserWorkAreaBounds()));
   EXPECT_EQ(root_bounds.bottom() - 5, toast_bounds.bottom());
 
   if (SupportsHostWindowResize()) {
-    // If host resize is not supported, ShelfLayoutManager::GetIdealBounds()
+    // If host resize is not supported then calling WmShelf::GetIdealBounds()

[James Cook, 2016/06/24 23:20:08]

The old code here is kind of bogus. There was a test failure on Windows in the
original patch, but the details are unclear, and I chose not to mess with it.

[msw, 2016/06/25 00:18:29]

Acknowledged.

     // doesn't return correct value.
     gfx::Rect shelf_bounds = shelf->GetIdealBounds();
     EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds));
     EXPECT_EQ(
         shelf_bounds.right() + (root_bounds.width() - shelf_bounds.width()) / 2,
         toast_bounds.CenterPoint().x());
   }
 }
 
 TEST_F(ToastManagerTest, PositionWithUnifiedDesktop) {
   if (!SupportsMultipleDisplays())
     return;
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   display_manager->SetUnifiedDesktopEnabled(true);
   UpdateDisplay("1000x500,0+600-100x500");
 
-  ShelfLayoutManager* shelf =
-      Shelf::ForPrimaryDisplay()->shelf_layout_manager();
-  SetShelfState(ash::SHELF_VISIBLE);
-  SetShelfAlignment(SHELF_ALIGNMENT_BOTTOM);
+  WmShelf* shelf = WmShelf::ForPrimaryDisplay();
+  EXPECT_EQ(SHELF_ALIGNMENT_BOTTOM, shelf->GetAlignment());
+  EXPECT_EQ(SHELF_VISIBLE, shelf->GetVisibilityState());
 
   ShowToast("DUMMY", ToastData::kInfiniteDuration);
   EXPECT_EQ(1, GetToastSerial());
 
   gfx::Rect toast_bounds = GetCurrentWidget()->GetWindowBoundsInScreen();
   gfx::Rect root_bounds =
       ScreenUtil::GetShelfDisplayBoundsInRoot(Shell::GetPrimaryRootWindow());
 
-  EXPECT_TRUE(toast_bounds.Intersects(shelf->user_work_area_bounds()));
+  EXPECT_TRUE(toast_bounds.Intersects(shelf->GetUserWorkAreaBounds()));
   EXPECT_TRUE(root_bounds.Contains(toast_bounds));
   EXPECT_NEAR(root_bounds.CenterPoint().x(), toast_bounds.CenterPoint().x(), 1);
 
   if (SupportsHostWindowResize()) {
-    // If host resize is not supported, ShelfLayoutManager::GetIdealBounds()
+    // If host resize is not supported then calling WmShelf::GetIdealBounds()
     // doesn't return correct value.
     gfx::Rect shelf_bounds = shelf->GetIdealBounds();
     EXPECT_FALSE(toast_bounds.Intersects(shelf_bounds));
     EXPECT_EQ(shelf_bounds.y() - 5, toast_bounds.bottom());
     EXPECT_EQ(root_bounds.bottom() - shelf_bounds.height() - 5,
               toast_bounds.bottom());
   }
 }
 
 TEST_F(ToastManagerTest, CancelToast) {
@@ skipping 13 matching lines @@
   EXPECT_EQ("TEXT3", GetCurrentText());
   // Cancel the shown toast.
   CancelToast(id3);
   // Confirm that the shown toast disappears.
   EXPECT_FALSE(GetCurrentOverlay());
   // Confirm that only 1 toast is shown.
   EXPECT_EQ(2, GetToastSerial());
 }
 
 }  // namespace ash