Convert TrayEventFilter to wm common types

ash/test/test_shell_delegate.h

Index: ash/test/test_shell_delegate.h
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 1c05b76a605dacfb32bd6cd886991ab04f2676cf..3ff45dfd94bfaefd7b470fb85e2f98f0ad521123 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -11,7 +11,6 @@
 #include "ash/media_delegate.h"
 #include "ash/shell_delegate.h"
 #include "ash/test/test_session_state_delegate.h"
-#include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 
@@ -61,7 +60,6 @@ class TestShellDelegate : public ShellDelegate {
   AccessibilityDelegate* CreateAccessibilityDelegate() override;
   NewWindowDelegate* CreateNewWindowDelegate() override;
   MediaDelegate* CreateMediaDelegate() override;
-  std::unique_ptr<ContainerDelegate> CreateContainerDelegate() override;
   std::unique_ptr<PointerWatcherDelegate> CreatePointerWatcherDelegate()
       override;
   ui::MenuModel* CreateContextMenu(WmShelf* wm_shelf,