Changes views_aura_mus_unittests to create DesktopNativeWidgetAura

ui/views/test/platform_test_helper.cc

 // Copyright 2016 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/test/platform_test_helper.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
+#include "ui/views/widget/widget.h"
+
+#if defined(USE_AURA)
+#include "ui/aura/window.h"
+#endif
+
+#if defined(OS_MACOSX)
+#include <Cocoa/Cocoa.h>
+
+#import "base/mac/scoped_nsobject.h"
+#include "ui/views/widget/native_widget_mac.h"
+#endif
 
 namespace views {
 namespace {
 
 class DefaultPlatformTestHelper : public PlatformTestHelper {

[msw, 2016/11/11 00:29:24]

Can we move the default SimulateNativeDestroy impl onto PlatformTestHelper and
use that, removing this default subclass altogether?

[sky, 2016/11/11 01:09:13]

Done.

  public:
   DefaultPlatformTestHelper() {}
 
   ~DefaultPlatformTestHelper() override {}
 
+  // PlatformTestHelper:
+  void SimulateNativeDestroy(Widget* widget) override {
+#if defined(USE_AURA)
+    delete widget->GetNativeView();
+#elif defined(OS_MACOSX)
+    // Retain the window while closing it, otherwise the window may lose its
+    // last
+    // owner before -[NSWindow close] completes (this offends AppKit). Usually
+    // this reference will exist on an event delivered to the runloop.
+    base::scoped_nsobject<NSWindow> window([widget->GetNativeWindow() retain]);
+    [window close];
+#endif
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultPlatformTestHelper);
 };
 
 PlatformTestHelper::Factory test_helper_factory;
 bool is_mus = false;
 bool is_aura_mus_client = false;
 
 }  // namespace
 
@@ skipping 23 matching lines @@
 void PlatformTestHelper::SetIsAuraMusClient() {
   is_aura_mus_client = true;
 }
 
 // static
 bool PlatformTestHelper::IsAuraMusClient() {
   return is_aura_mus_client;
 }
 
 }  // namespace views