Remove deprecated OS_WIN checks in src/ash

Ash is no longer built on Windows.
Also cleanup DragDropControllerTest.

Bug: NONE
Change-Id: I73b3ce606aca98abc6248f7cf8356c6307a785b6
Reviewed-on: https://chromium-review.googlesource.com/723866Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#509543}

ash/display/cursor_window_controller_unittest.cc

@@ -114,8 +114,6 @@ TEST_F(CursorWindowControllerTest, MoveToDifferentDisplay) {
   EXPECT_EQ(50, cursor_bounds.y() + hot_point.y());
 }
 
-// Windows doesn't support compositor based cursor.
-#if !defined(OS_WIN)
 // Make sure that composition cursor inherits the visibility state.
 TEST_F(CursorWindowControllerTest, VisibilityTest) {
   ASSERT_TRUE(GetCursorWindow());
@@ -169,6 +167,5 @@ TEST_F(CursorWindowControllerTest, DSF) {
       display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_TRUE(GetCursorImage().HasRepresentation(2.0f));
 }
-#endif
 
 }  // namespace ash

ash/drag_drop/drag_drop_controller_unittest.cc

@@ -14,6 +14,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/drag_drop_client_observer.h"
+#include "ui/aura/client/drag_drop_delegate.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ -32,8 +33,6 @@
 #include "ui/gfx/animation/linear_animation.h"
 #include "ui/gfx/image/image_skia_rep.h"
 #include "ui/views/view.h"
-#include "ui/views/widget/native_widget_aura.h"
-#include "ui/views/widget/native_widget_delegate.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
@@ -195,24 +194,6 @@ class TestDragDropController : public DragDropController {
   DISALLOW_COPY_AND_ASSIGN(TestDragDropController);
 };
 
-class TestNativeWidgetAura : public views::NativeWidgetAura {
- public:
-  explicit TestNativeWidgetAura(views::internal::NativeWidgetDelegate* delegate)
-      : NativeWidgetAura(delegate), check_if_capture_lost_(false) {}
-
-  void set_check_if_capture_lost(bool value) { check_if_capture_lost_ = value; }
-
-  void OnCaptureLost() override {
-    DCHECK(!check_if_capture_lost_);
-    views::NativeWidgetAura::OnCaptureLost();
-  }
-
- private:
-  bool check_if_capture_lost_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestNativeWidgetAura);
-};
-
 class TestObserver : public aura::client::DragDropClientObserver {
  public:
   enum class State { kNotInvoked, kDragStartedInvoked, kDragEndedInvoked };
@@ -279,25 +260,11 @@ class EventTargetTestDelegate : public aura::client::DragDropDelegate {
   DISALLOW_COPY_AND_ASSIGN(EventTargetTestDelegate);
 };
 
-// TODO(sky): this is for debugging, remove when track down failure.
-void SetCheckIfCaptureLost(views::Widget* widget, bool value) {
-// On Windows, the DCHECK triggers when running on bot or locally through RDP,
-// but not when logged in locally.
-#if !defined(OS_WIN)
-  static_cast<TestNativeWidgetAura*>(widget->native_widget())
-      ->set_check_if_capture_lost(value);
-#endif
-}
-
-views::Widget* CreateNewWidget() {
-  views::Widget* widget = new views::Widget;
+std::unique_ptr<views::Widget> CreateFramelessWidget() {
+  std::unique_ptr<views::Widget> widget = std::make_unique<views::Widget>();
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
-  params.accept_events = true;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.parent = Shell::GetPrimaryRootWindow();
-  params.child = true;
-  params.native_widget = new TestNativeWidgetAura(widget);
   widget->Init(params);
   widget->Show();
   return widget;
@@ -392,7 +359,7 @@ class DragDropControllerTest : public AshTestBase {
 };
 
 TEST_F(DragDropControllerTest, DragDropInSingleViewTest) {
-  std::unique_ptr<views::Widget> widget(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget = CreateTestWidget();
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::OSExchangeData data;
@@ -402,7 +369,6 @@ TEST_F(DragDropControllerTest, DragDropInSingleViewTest) {
   generator.PressLeftButton();
 
   int num_drags = 17;
-  SetCheckIfCaptureLost(widget.get(), true);
   for (int i = 0; i < num_drags; ++i) {
     // Because we are not doing a blocking drag and drop, the original
     // OSDragExchangeData object is lost as soon as we return from the drag
@@ -410,10 +376,6 @@ TEST_F(DragDropControllerTest, DragDropInSingleViewTest) {
     // drag_data_ to a fake drag data object that we created.
     if (i > 0)
       UpdateDragData(&data);
-    // 7 comes from views::View::GetVerticalDragThreshold()).
-    if (i >= 7)
-      SetCheckIfCaptureLost(widget.get(), false);
-
     generator.MoveMouseBy(0, 1);
 
     // Execute any scheduled draws to process deferred mouse events.
@@ -438,7 +400,7 @@ TEST_F(DragDropControllerTest, DragDropInSingleViewTest) {
 }
 
 TEST_F(DragDropControllerTest, DragDropWithZeroDragUpdates) {
-  std::unique_ptr<views::Widget> widget(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget = CreateTestWidget();
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::OSExchangeData data;
@@ -476,7 +438,7 @@ TEST_F(DragDropControllerTest, DragDropWithZeroDragUpdates) {
 }
 
 TEST_F(DragDropControllerTest, DragDropInMultipleViewsSingleWidgetTest) {
-  std::unique_ptr<views::Widget> widget(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget = CreateFramelessWidget();
   DragTestView* drag_view1 = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view1);
   DragTestView* drag_view2 = new DragTestView;
@@ -531,10 +493,10 @@ TEST_F(DragDropControllerTest, DragDropInMultipleViewsSingleWidgetTest) {
 }
 
 TEST_F(DragDropControllerTest, DragDropInMultipleViewsMultipleWidgetsTest) {
-  std::unique_ptr<views::Widget> widget1(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget1 = CreateFramelessWidget();
   DragTestView* drag_view1 = new DragTestView;
   AddViewToWidgetAndResize(widget1.get(), drag_view1);
-  std::unique_ptr<views::Widget> widget2(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget2 = CreateFramelessWidget();
   DragTestView* drag_view2 = new DragTestView;
   AddViewToWidgetAndResize(widget2.get(), drag_view2);
   gfx::Rect widget1_bounds = widget1->GetClientAreaBoundsInScreen();
@@ -591,7 +553,7 @@ TEST_F(DragDropControllerTest, DragDropInMultipleViewsMultipleWidgetsTest) {
 }
 
 TEST_F(DragDropControllerTest, ViewRemovedWhileInDragDropTest) {
-  std::unique_ptr<views::Widget> widget(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget = CreateTestWidget();
   std::unique_ptr<DragTestView> drag_view(new DragTestView);
   AddViewToWidgetAndResize(widget.get(), drag_view.get());
   ui::OSExchangeData data;
@@ -654,7 +616,7 @@ TEST_F(DragDropControllerTest, DragLeavesClipboardAloneTest) {
   EXPECT_TRUE(cb->IsFormatAvailable(ui::Clipboard::GetPlainTextFormatType(),
                                     ui::CLIPBOARD_TYPE_COPY_PASTE));
 
-  std::unique_ptr<views::Widget> widget(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget = CreateTestWidget();
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
 
@@ -682,7 +644,7 @@ TEST_F(DragDropControllerTest, DragLeavesClipboardAloneTest) {
 }
 
 TEST_F(DragDropControllerTest, WindowDestroyedDuringDragDrop) {
-  std::unique_ptr<views::Widget> widget(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget = CreateTestWidget();
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   aura::Window* window = widget->GetNativeView();
@@ -728,7 +690,7 @@ TEST_F(DragDropControllerTest, WindowDestroyedDuringDragDrop) {
 }
 
 TEST_F(DragDropControllerTest, SyntheticEventsDuringDragDrop) {
-  std::unique_ptr<views::Widget> widget(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget = CreateTestWidget();
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::OSExchangeData data;
@@ -778,7 +740,7 @@ TEST_F(DragDropControllerTest, SyntheticEventsDuringDragDrop) {
 }
 
 TEST_F(DragDropControllerTest, PressingEscapeCancelsDragDrop) {
-  std::unique_ptr<views::Widget> widget(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget = CreateTestWidget();
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::OSExchangeData data;
@@ -820,7 +782,7 @@ TEST_F(DragDropControllerTest, PressingEscapeCancelsDragDrop) {
 }
 
 TEST_F(DragDropControllerTest, CaptureLostCancelsDragDrop) {
-  std::unique_ptr<views::Widget> widget(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget = CreateTestWidget();
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::OSExchangeData data;
@@ -870,10 +832,10 @@ TEST_F(DragDropControllerTest, CaptureLostCancelsDragDrop) {
 TEST_F(DragDropControllerTest, TouchDragDropInMultipleWindows) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableTouchDragDrop);
-  std::unique_ptr<views::Widget> widget1(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget1 = CreateFramelessWidget();
   DragTestView* drag_view1 = new DragTestView;
   AddViewToWidgetAndResize(widget1.get(), drag_view1);
-  std::unique_ptr<views::Widget> widget2(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget2 = CreateFramelessWidget();
   DragTestView* drag_view2 = new DragTestView;
   AddViewToWidgetAndResize(widget2.get(), drag_view2);
   gfx::Rect widget1_bounds = widget1->GetClientAreaBoundsInScreen();
@@ -932,7 +894,7 @@ TEST_F(DragDropControllerTest, TouchDragDropInMultipleWindows) {
 TEST_F(DragDropControllerTest, TouchDragDropCancelsOnLongTap) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableTouchDragDrop);
-  std::unique_ptr<views::Widget> widget(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget = CreateTestWidget();
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
@@ -958,7 +920,7 @@ TEST_F(DragDropControllerTest, TouchDragDropCancelsOnLongTap) {
 TEST_F(DragDropControllerTest, TouchDragDropLongTapGestureIsForwarded) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableTouchDragDrop);
-  std::unique_ptr<views::Widget> widget(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget = CreateTestWidget();
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
@@ -1009,7 +971,7 @@ TEST_F(DragDropControllerTest, DragCancelAcrossDisplays) {
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
   {
-    std::unique_ptr<views::Widget> widget(CreateNewWidget());
+    std::unique_ptr<views::Widget> widget = CreateTestWidget();
     aura::Window* window = widget->GetNativeWindow();
     drag_drop_controller_->StartDragAndDrop(
         data, window->GetRootWindow(), window, gfx::Point(5, 5),
@@ -1040,7 +1002,7 @@ TEST_F(DragDropControllerTest, DragCancelAcrossDisplays) {
   }
 
   {
-    std::unique_ptr<views::Widget> widget(CreateNewWidget());
+    std::unique_ptr<views::Widget> widget = CreateTestWidget();
     aura::Window* window = widget->GetNativeWindow();
     drag_drop_controller_->StartDragAndDrop(
         data, window->GetRootWindow(), window, gfx::Point(405, 405),
@@ -1083,7 +1045,7 @@ TEST_F(DragDropControllerTest, DragCancelOnDisplayDisconnect) {
 
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
-  std::unique_ptr<views::Widget> widget(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget = CreateTestWidget();
   aura::Window* window = widget->GetNativeWindow();
   drag_drop_controller_->StartDragAndDrop(
       data, window->GetRootWindow(), window, gfx::Point(5, 5),
@@ -1117,7 +1079,7 @@ TEST_F(DragDropControllerTest, TouchDragDropCompletesOnFling) {
       switches::kEnableTouchDragDrop);
   ui::GestureConfiguration::GetInstance()
       ->set_max_touch_move_in_pixels_for_click(1);
-  std::unique_ptr<views::Widget> widget(CreateNewWidget());
+  std::unique_ptr<views::Widget> widget = CreateTestWidget();
   DragTestView* drag_view = new DragTestView;
   AddViewToWidgetAndResize(widget.get(), drag_view);
   ui::OSExchangeData data;
@@ -1174,7 +1136,7 @@ TEST_F(DragDropControllerTest, DragStartedAndEndedEvents) {
   ui::OSExchangeData data;
   data.SetString(base::UTF8ToUTF16("I am being dragged"));
   {
-    std::unique_ptr<views::Widget> widget(CreateNewWidget());
+    std::unique_ptr<views::Widget> widget = CreateTestWidget();
     aura::Window* window = widget->GetNativeWindow();
     drag_drop_controller_->StartDragAndDrop(
         data, window->GetRootWindow(), window, gfx::Point(5, 5),