Converts ash to use aura-mus

ash/mus/bridge/workspace_event_handler_mus.cc

Index: ash/mus/bridge/workspace_event_handler_mus.cc
diff --git a/ash/mus/bridge/workspace_event_handler_mus.cc b/ash/mus/bridge/workspace_event_handler_mus.cc
index a866c38107fff1c03b5d4b87a0527a4bc6d96bae..ae03b4f3e6260e94bb9d38897fd9678ffde7b35b 100644
--- a/ash/mus/bridge/workspace_event_handler_mus.cc
+++ b/ash/mus/bridge/workspace_event_handler_mus.cc
@@ -4,34 +4,35 @@
 
 #include "ash/mus/bridge/workspace_event_handler_mus.h"
 
-#include "services/ui/public/cpp/window.h"
-#include "services/ui/public/cpp/window_property.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_property.h"
 
-MUS_DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::WorkspaceEventHandlerMus*);
+DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::WorkspaceEventHandlerMus*);
 
 namespace {
 
-MUS_DEFINE_LOCAL_WINDOW_PROPERTY_KEY(ash::mus::WorkspaceEventHandlerMus*,
-                                     kWorkspaceEventHandlerProperty,
-                                     nullptr);
+DEFINE_WINDOW_PROPERTY_KEY(ash::mus::WorkspaceEventHandlerMus*,
+                           kWorkspaceEventHandlerProperty,
+                           nullptr);
 
 }  // namespace
 
 namespace ash {
 namespace mus {
 
-WorkspaceEventHandlerMus::WorkspaceEventHandlerMus(ui::Window* workspace_window)
+WorkspaceEventHandlerMus::WorkspaceEventHandlerMus(
+    aura::Window* workspace_window)
     : workspace_window_(workspace_window) {
-  workspace_window_->SetLocalProperty(kWorkspaceEventHandlerProperty, this);
+  workspace_window_->SetProperty(kWorkspaceEventHandlerProperty, this);
 }
 
 WorkspaceEventHandlerMus::~WorkspaceEventHandlerMus() {
-  workspace_window_->ClearLocalProperty(kWorkspaceEventHandlerProperty);
+  workspace_window_->ClearProperty(kWorkspaceEventHandlerProperty);
 }
 
 // static
-WorkspaceEventHandlerMus* WorkspaceEventHandlerMus::Get(ui::Window* window) {
-  return window->GetLocalProperty(kWorkspaceEventHandlerProperty);
+WorkspaceEventHandlerMus* WorkspaceEventHandlerMus::Get(aura::Window* window) {
+  return window->GetProperty(kWorkspaceEventHandlerProperty);
 }
 
 }  // namespace mus