Moves FrameDecorations from Display to WindowManagerState

components/mus/ws/test_utils.h

Index: components/mus/ws/test_utils.h
diff --git a/components/mus/ws/test_utils.h b/components/mus/ws/test_utils.h
index 7746f2b251fcb6f9f13ef5c3945598d31f1bae63..642fd1b78e84866a651a59bd101aca9c34e276d1 100644
--- a/components/mus/ws/test_utils.h
+++ b/components/mus/ws/test_utils.h
@@ -7,12 +7,14 @@
 
 #include <stdint.h>
 
+#include "components/mus/public/interfaces/display.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/ws/connection_manager_delegate.h"
 #include "components/mus/ws/display.h"
 #include "components/mus/ws/platform_display.h"
 #include "components/mus/ws/platform_display_factory.h"
 #include "components/mus/ws/test_change_tracker.h"
+#include "components/mus/ws/user_display_manager.h"
 #include "components/mus/ws/window_manager_factory_registry.h"
 #include "components/mus/ws/window_tree.h"
 #include "components/mus/ws/window_tree_binding.h"
@@ -38,6 +40,25 @@ class WindowManagerFactoryRegistryTestApi {
 
 // -----------------------------------------------------------------------------
 
+class UserDisplayManagerTestApi {
+ public:
+  explicit UserDisplayManagerTestApi(UserDisplayManager* udm) : udm_(udm) {}
+  ~UserDisplayManagerTestApi() {}
+
+  void SetTestObserver(mojom::DisplayManagerObserver* observer) {
+    udm_->test_observer_ = observer;
+    if (observer)
+      udm_->OnObserverAdded(observer);
+  }
+
+ private:
+  UserDisplayManager* udm_;
+
+  DISALLOW_COPY_AND_ASSIGN(UserDisplayManagerTestApi);
+};
+
+// -----------------------------------------------------------------------------
+
 class WindowTreeTestApi {
  public:
   WindowTreeTestApi(WindowTree* tree);