Fixes and test updates for aura-mus

ui/views/widget/widget_unittest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <memory>
 #include <set>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 829 matching lines @@
   EXPECT_EQ(child2, widget_hidden());
 
   child1->Show();
   EXPECT_EQ(child1, widget_shown());
 
   child2->Show();
   EXPECT_EQ(child2, widget_shown());
 }
 
 TEST_F(WidgetObserverTest, DestroyBubble) {
+  // This test expect NativeWidgetAura, force its creation.
+  ViewsDelegate::GetInstance()->set_native_widget_factory(
+      ViewsDelegate::NativeWidgetFactory());
+
   WidgetAutoclosePtr anchor(CreateTopLevelPlatformWidget());
   anchor->Show();
 
   BubbleDialogDelegateView* bubble_delegate =
       new TestBubbleDialogDelegateView(anchor->client_view());
   {
     WidgetAutoclosePtr bubble_widget(
         BubbleDialogDelegateView::CreateBubble(bubble_delegate));
     bubble_widget->Show();
   }
@@ skipping 404 matching lines @@
   EXPECT_FALSE(contents_view->HasFocus());
   EXPECT_TRUE(bubble_delegate_view->HasFocus());
 
   bubble_delegate_view->GetWidget()->CloseNow();
 
   // Closing the bubble should result in focus going back to the contents view.
   EXPECT_TRUE(contents_view->HasFocus());
 }
 
 TEST_F(WidgetTest, BubbleControlsResetOnInit) {
+  // This test creates a NativeWidgetAura and then a bubble parented to it. This
+  // means the test needs a NativeWidgetAura for the bubble as well.
+  ViewsDelegate::GetInstance()->set_native_widget_factory(
+      ViewsDelegate::NativeWidgetFactory());
+
   WidgetAutoclosePtr anchor(CreateTopLevelPlatformWidget());
   anchor->Show();
 
   {
     TestBubbleDialogDelegateView* bubble_delegate =
         new TestBubbleDialogDelegateView(anchor->client_view());
     WidgetAutoclosePtr bubble_widget(
         BubbleDialogDelegateView::CreateBubble(bubble_delegate));
     EXPECT_TRUE(bubble_delegate->reset_controls_called_);
     bubble_widget->Show();
@@ skipping 2564 matching lines @@
     Transparency_DesktopWidgetTranslucent
 #endif
 TEST_F(CompositingWidgetTest, MAYBE_Transparency_DesktopWidgetTranslucent) {
   CheckAllWidgetsForOpacity(Widget::InitParams::TRANSLUCENT_WINDOW);
 }
 
 #endif  // !defined(OS_CHROMEOS)
 
 }  // namespace test
 }  // namespace views