Get AcceleratorControllerTest working with mash

ui/views/mus/native_widget_mus.cc

Index: ui/views/mus/native_widget_mus.cc
diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc
index 31a680259d7b3005a3c2ff57422e5f0b1cf9db0e..fe8faed0c68ef44acd9aebc8f5f2f04517fc3e9a 100644
--- a/ui/views/mus/native_widget_mus.cc
+++ b/ui/views/mus/native_widget_mus.cc
@@ -648,9 +648,13 @@ void NativeWidgetMus::ConfigurePropertiesForNewWindow(
   (*properties)[ui::mojom::WindowManager::kWindowType_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(static_cast<int32_t>(
           mojo::ConvertTo<ui::mojom::WindowType>(init_params.type)));
-  (*properties)[ui::mojom::WindowManager::kResizeBehavior_Property] =
-      mojo::ConvertTo<std::vector<uint8_t>>(
-          ResizeBehaviorFromDelegate(init_params.delegate));
+  if (!init_params.delegate &&
+      properties->count(ui::mojom::WindowManager::kResizeBehavior_Property) ==
+          0) {
+    (*properties)[ui::mojom::WindowManager::kResizeBehavior_Property] =
+        mojo::ConvertTo<std::vector<uint8_t>>(
+            ResizeBehaviorFromDelegate(init_params.delegate));
+  }
   SkBitmap app_icon = AppIconFromDelegate(init_params.delegate);
   if (!app_icon.isNull()) {
     (*properties)[ui::mojom::WindowManager::kWindowAppIcon_Property] =