Changes views_aura_mus_unittests to create DesktopNativeWidgetAura

ui/views/controls/native/native_view_host_aura_unittest.cc

 // Copyright (c) 2013 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/controls/native/native_view_host_aura.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 251 matching lines @@
 
   NativeViewHostWindowObserver test_observer;
   child_win->AddObserver(&test_observer);
 
   host()->Detach();
   EXPECT_EQ(root_window, child_win->GetRootWindow());
   EXPECT_EQ(child_win_tree_host, child_win->GetHost());
 
   DestroyHost();
   DestroyTopLevel();
-  if (!IsMus()) {
+  if (!IsMus() && !IsAuraMusClient()) {
     // The window is detached, so no longer associated with any Widget
     // hierarchy. The root window still owns it, but the test harness checks
     // for orphaned windows during TearDown().
     EXPECT_EQ(0u, test_observer.events().size())
         << (*test_observer.events().begin()).type;
     delete child_win;
   } else {
-    // In mus, the child window is still attached to the aura::WindowTreeHost
-    // for the Widget. So destroying the toplevel Widget takes down the child
-    // window with it.
+    // In mus and aura-mus, the child window is still attached to the
+    // aura::WindowTreeHost for the Widget. So destroying the toplevel Widget
+    // takes down the child window with it.
   }
 
   ASSERT_EQ(1u, test_observer.events().size());
   EXPECT_EQ(NativeViewHostWindowObserver::EVENT_DESTROYED,
             test_observer.events().back().type);
 }
 
 // Ensure the clipping window is hidden before setting the native view's bounds.
 // This is a regression test for http://crbug.com/388699.
 TEST_F(NativeViewHostAuraTest, RemoveClippingWindowOrder) {
@@ skipping 77 matching lines @@
 
   host()->SetVisible(false);
   EXPECT_FALSE(clipping_window()->IsVisible());
   EXPECT_FALSE(child()->IsVisible());
 
   DestroyHost();
   DestroyTopLevel();
 }
 
 }  // namespace views