mash: Convert AshPopupAlignmentDelegate to wm common types

ash/test/ash_test_base.h

Index: ash/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index a4e7cb47dd6d45f92b332bb14d98f99b8f210138..df73c7d848f1a5e3d357d9af3a9fe4e882f2db51 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -43,6 +43,7 @@ class WindowDelegate;
 namespace ash {
 class DisplayManager;
 class SystemTray;
+class WmShelf;
 
 namespace test {
 
@@ -117,6 +118,9 @@ class AshTestBase : public testing::Test {
   // Proxy to AshTestHelper::SupportsHostWindowResize().
   static bool SupportsHostWindowResize();
 
+  // Returns the WmShelf for the primary display.
+  static WmShelf* GetPrimaryShelf();
+
   void set_start_session(bool start_session) { start_session_ = start_session; }
 
   AshTestHelper* ash_test_helper() { return ash_test_helper_.get(); }