[Views] Move modality tests from widget_unittest.cc to desktop_native_widget_aura_unittest.cc.

ui/views/test/widget_test.cc

Index: ui/views/test/widget_test.cc
diff --git a/ui/views/test/widget_test.cc b/ui/views/test/widget_test.cc
index 57fc8c3765e5e953dea3572bbcd93a7077c367f0..d75bfb1d9ef85f6f1f867938fe5e596a87a3bbcb 100644
--- a/ui/views/test/widget_test.cc
+++ b/ui/views/test/widget_test.cc
@@ -111,5 +111,46 @@ View* WidgetTest::GetGestureHandler(internal::RootView* root_view) {
   return root_view->gesture_handler_;
 }
 
+TestDesktopWidgetDelegate::TestDesktopWidgetDelegate() : widget_(new Widget) {
+}
+
+TestDesktopWidgetDelegate::~TestDesktopWidgetDelegate() {
+  if (widget_)
+    widget_->CloseNow();
+  EXPECT_FALSE(widget_);
+}
+
+// Initialize the Widget, adding some meaningful default InitParams.

[tapted, 2015/08/03 01:10:46]

remove

[jackhou1, 2015/08/03 05:09:50]

Done.

+void TestDesktopWidgetDelegate::InitWidget(Widget::InitParams init_params) {
+  init_params.delegate = this;
+#if !defined(OS_CHROMEOS)
+  init_params.native_widget = new PlatformDesktopNativeWidget(widget_);
+#endif
+  init_params.bounds = initial_bounds_;
+  widget_->Init(init_params);
+}
+
+// WidgetDelegate s:

[tapted, 2015/08/03 01:10:46]

remove

[jackhou1, 2015/08/03 05:09:50]

Done.

+void TestDesktopWidgetDelegate::WindowClosing() {
+  window_closing_count_++;
+  widget_ = nullptr;
+}
+
+Widget* TestDesktopWidgetDelegate::GetWidget() {
+  return widget_;
+}
+
+const Widget* TestDesktopWidgetDelegate::GetWidget() const {
+  return widget_;
+}
+
+View* TestDesktopWidgetDelegate::GetContentsView() {
+  return contents_view_ ? contents_view_ : WidgetDelegate::GetContentsView();
+}
+
+bool TestDesktopWidgetDelegate::ShouldAdvanceFocusToTopLevelWidget() const {
+  return true;  // Same default as DefaultWidgetDelegate in widget.cc.
+}
+
 }  // namespace test
 }  // namespace views