Changes views_aura_mus_unittests to create DesktopNativeWidgetAura

ui/views/test/native_widget_factory_desktop.cc

Index: ui/views/test/native_widget_factory_desktop.cc
diff --git a/ui/views/test/native_widget_factory_desktop.cc b/ui/views/test/native_widget_factory_desktop.cc
index 8129b3ac10ebce4f73a1d55d8e91e35c33de6e3a..867642cd8cac573b0bc19547dde97387af83fc90 100644
--- a/ui/views/test/native_widget_factory_desktop.cc
+++ b/ui/views/test/native_widget_factory_desktop.cc
@@ -4,11 +4,11 @@
 
 #include "ui/views/test/native_widget_factory.h"
 
+#include "ui/views/test/test_platform_native_widget.h"
+
 #if defined(USE_AURA)
-#include "ui/views/widget/native_widget_aura.h"
-#if !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
-#endif
+#include "ui/views/widget/native_widget_aura.h"
 #elif defined(OS_MACOSX)
 #include "ui/views/widget/native_widget_mac.h"
 #endif
@@ -16,53 +16,35 @@
 namespace views {
 namespace test {
 
-#if !defined(OS_CHROMEOS)
-
+NativeWidget* CreatePlatformNativeWidgetImpl(
+    const Widget::InitParams& init_params,
+    Widget* widget,
+    uint32_t type,
+    bool* destroyed) {
 #if defined(OS_MACOSX)
-using PlatformDesktopNativeWidget = NativeWidgetMac;
+  return new TestPlatformNativeWidget<NativeWidgetMac>(
+      widget, type == kStubCapture, destroyed);
 #else
-using PlatformDesktopNativeWidget = DesktopNativeWidgetAura;
+  return new TestPlatformNativeWidget<NativeWidgetAura>(
+      widget, type == kStubCapture, destroyed);
 #endif
-
-namespace {
-
-class TestPlatformDesktopNativeWidget : public PlatformDesktopNativeWidget {
- public:
-  TestPlatformDesktopNativeWidget(internal::NativeWidgetDelegate* delegate,
-                                  bool* destroyed);
-  ~TestPlatformDesktopNativeWidget() override;
-
- private:
-  bool* destroyed_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestPlatformDesktopNativeWidget);
-};
-
-// A widget that assumes mouse capture always works. It won't in testing, so we
-// mock it.
-TestPlatformDesktopNativeWidget::TestPlatformDesktopNativeWidget(
-    internal::NativeWidgetDelegate* delegate,
-    bool* destroyed)
-    : PlatformDesktopNativeWidget(delegate), destroyed_(destroyed) {}
-
-TestPlatformDesktopNativeWidget::~TestPlatformDesktopNativeWidget() {
-  if (destroyed_)
-    *destroyed_ = true;
 }
 
-}  // namespace
-
-#endif
-
 NativeWidget* CreatePlatformDesktopNativeWidgetImpl(
     const Widget::InitParams& init_params,
     Widget* widget,
     bool* destroyed) {
-#if defined(OS_CHROMEOS)
-  // Chromeos only has one NativeWidgetType.
-  return CreatePlatformNativeWidgetImpl(init_params, widget, 0u, destroyed);
-#else
-  return new TestPlatformDesktopNativeWidget(widget, destroyed);
+#if defined(OS_MACOSX)
+  return new TestPlatformNativeWidget<NativeWidgetMac>(widget, false,
+                                                       destroyed);
+#elif defined(OS_CHROMEOS)
+  // Chromeos only has one NativeWidgetType. Chromeos with aura-mus does not
+  // compile this file.
+  return new TestPlatformNativeWidget<NativeWidgetAura>(widget, false,
+                                                        destroyed);
+#elif defined(USE_AURA)

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

I guess this isn't compiled anywhere that lacks a return statement, still, maybe
add a NOTREACHED(); return nullptr; in an #else block or outside the
preprocessor macro blocks?

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

Done.

+  return new TestPlatformNativeWidget<DesktopNativeWidgetAura>(widget, false,
+                                                               destroyed);
 #endif
 }