Get AcceleratorControllerTest working with mash

ui/views/mus/native_widget_mus.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/mus/native_widget_mus.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 630 matching lines @@
   }
   (*properties)[ui::mojom::WindowManager::kAlwaysOnTop_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(init_params.keep_on_top);
 
   if (!Widget::RequiresNonClientView(init_params.type))
     return;
 
   (*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] =
         mojo::ConvertTo<std::vector<uint8_t>>(app_icon);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMus, internal::NativeWidgetPrivate implementation:
 
@@ skipping 753 matching lines @@
 
   gfx::Path mask_path;
   native_widget_delegate_->GetHitTestMask(&mask_path);
   // TODO(jamescook): Use the full path for the mask.
   gfx::Rect mask_rect =
       gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
   window_->SetHitTestMask(mask_rect);
 }
 
 }  // namespace views