mash: Convert AshPopupAlignmentDelegate to wm common types

ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

 // Copyright 2014 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/system/web_notification/ash_popup_alignment_delegate.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/common/shelf/shelf_types.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
+#include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.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/test/ash_test_base.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/keyboard/keyboard_util.h"
 #include "ui/message_center/message_center_style.h"
 
 namespace ash {
+namespace {
+
+// Returns the shelf for the primary display.
+WmShelf* GetPrimaryShelf() {

[msw, 2016/06/16 18:56:48]

nit: Add to AshTestBase? We'll likely need this (or lookup by display id or
similar) for other tests.

[James Cook, 2016/06/16 21:08:14]

Moved to AshTestBase.

+  return WmShell::Get()
+      ->GetPrimaryRootWindow()
+      ->GetRootWindowController()
+      ->GetShelf();
+}
+
+}  // namespace
 
 class AshPopupAlignmentDelegateTest : public test::AshTestBase {
  public:
   AshPopupAlignmentDelegateTest() {}
   ~AshPopupAlignmentDelegateTest() override {}
 
   void SetUp() override {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         keyboard::switches::kEnableVirtualKeyboard);
     test::AshTestBase::SetUp();
-    SetAlignmentDelegate(base::WrapUnique(new AshPopupAlignmentDelegate(
-        Shelf::ForPrimaryDisplay()->shelf_layout_manager())));
+    SetAlignmentDelegate(
+        base::WrapUnique(new AshPopupAlignmentDelegate(GetPrimaryShelf())));
   }
 
   void TearDown() override {
     alignment_delegate_.reset();
     test::AshTestBase::TearDown();
   }
 
   void SetKeyboardBounds(const gfx::Rect& new_bounds) {
     Shelf::ForPrimaryDisplay()
         ->shelf_layout_manager()
@@ skipping 60 matching lines @@
         ->GetRootWindowController()
         ->ConfigureWidgetInitParamsForContainer(widget.get(), container_id,
                                                 &params);
     widget->Init(params);
     widget->Show();
     return widget;
   }
 
  private:
   std::unique_ptr<AshPopupAlignmentDelegate> alignment_delegate_;
+
+  DISALLOW_COPY_AND_ASSIGN(AshPopupAlignmentDelegateTest);
 };
 
 #if defined(OS_WIN) && !defined(USE_ASH)
 // TODO(msw): Broken on Windows. http://crbug.com/584038
 #define MAYBE_ShelfAlignment DISABLED_ShelfAlignment
 #else
 #define MAYBE_ShelfAlignment ShelfAlignment
 #endif
 TEST_F(AshPopupAlignmentDelegateTest, MAYBE_ShelfAlignment) {
   const gfx::Rect toast_size(0, 0, 10, 10);
@@ skipping 140 matching lines @@
 
   EXPECT_EQ(origin_x, alignment_delegate()->GetToastOriginX(toast_size));
   EXPECT_EQ(baseline - kTrayHeight - message_center::kMarginBetweenItems,
             alignment_delegate()->GetBaseLine());
 }
 
 TEST_F(AshPopupAlignmentDelegateTest, Extended) {
   if (!SupportsMultipleDisplays())
     return;
   UpdateDisplay("600x600,800x800");
-  SetAlignmentDelegate(base::WrapUnique(new AshPopupAlignmentDelegate(
-      Shelf::ForPrimaryDisplay()->shelf_layout_manager())));
+  SetAlignmentDelegate(
+      base::WrapUnique(new AshPopupAlignmentDelegate(GetPrimaryShelf())));
 
   display::Display second_display = ScreenUtil::GetSecondaryDisplay();
-  AshPopupAlignmentDelegate for_2nd_display(
-      Shelf::ForDisplayId(second_display.id())->shelf_layout_manager());
+  WmShelf* second_shelf =
+      WmLookup::Get()
+          ->GetRootWindowControllerWithDisplayId(second_display.id())
+          ->GetShelf();
+  AshPopupAlignmentDelegate for_2nd_display(second_shelf);
   UpdateWorkArea(&for_2nd_display, second_display);
   // Make sure that the toast position on the secondary display is
   // positioned correctly.
   EXPECT_LT(1300, for_2nd_display.GetToastOriginX(gfx::Rect(0, 0, 10, 10)));
   EXPECT_LT(700, for_2nd_display.GetBaseLine());
 }
 
 TEST_F(AshPopupAlignmentDelegateTest, Unified) {
   if (!SupportsMultipleDisplays())
     return;
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   display_manager->SetUnifiedDesktopEnabled(true);
 
   // Reset the delegate as the primary display's shelf will be destroyed during
   // transition.
   SetAlignmentDelegate(nullptr);
 
   UpdateDisplay("600x600,800x800");
-  SetAlignmentDelegate(base::WrapUnique(new AshPopupAlignmentDelegate(
-      Shelf::ForPrimaryDisplay()->shelf_layout_manager())));
+  SetAlignmentDelegate(
+      base::WrapUnique(new AshPopupAlignmentDelegate(GetPrimaryShelf())));
 
   EXPECT_GT(600,
             alignment_delegate()->GetToastOriginX(gfx::Rect(0, 0, 10, 10)));
 }
 
 // Tests that when the keyboard is showing that notifications appear above it,
 // and that they return to normal once the keyboard is gone.
 #if defined(OS_WIN) && !defined(USE_ASH)
 // TODO(msw): Broken on Windows. http://crbug.com/584038
 #define MAYBE_KeyboardShowing DISABLED_KeyboardShowing
@@ skipping 11 matching lines @@
   SetKeyboardBounds(keyboard_bounds);
   int keyboard_baseline = alignment_delegate()->GetBaseLine();
   EXPECT_NE(baseline, keyboard_baseline);
   EXPECT_GT(keyboard_bounds.y(), keyboard_baseline);
 
   SetKeyboardBounds(gfx::Rect());
   EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine());
 }
 
 }  // namespace ash