Changes views_aura_mus_unittests to create DesktopNativeWidgetAura

ui/views/touchui/touch_selection_controller_impl_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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/screen_position_client.h"
@@ skipping 57 matching lines @@
         views_tsc_factory_(new ViewsTouchEditingControllerFactory) {
     ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get());
   }
 
   ~TouchSelectionControllerImplTest() override {
     ui::TouchEditingControllerFactory::SetInstance(nullptr);
   }
 
   void SetUp() override {
     ViewsTestBase::SetUp();
+    if (IsAuraMusClient())
+      return;
     test_cursor_client_.reset(new aura::test::TestCursorClient(GetContext()));
   }
 
   void TearDown() override {
-    test_cursor_client_.reset();
-    if (textfield_widget_ && !textfield_widget_->IsClosed())
-      textfield_widget_->Close();
-    if (widget_ && !widget_->IsClosed())
-      widget_->Close();
+    if (!IsAuraMusClient()) {

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

nit: only use the conditional for test_cursor_client_.reset(); it seems like if
a test case managed to call CreateTextfield or CreateWidget, we should still
close those widgets regardless.

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

Done.

+      test_cursor_client_.reset();
+      if (textfield_widget_ && !textfield_widget_->IsClosed())
+        textfield_widget_->Close();
+      if (widget_ && !widget_->IsClosed())
+        widget_->Close();
+    }
     ViewsTestBase::TearDown();
   }
 
   void CreateTextfield() {
     textfield_ = new Textfield();
     textfield_widget_ = new Widget;
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(0, 0, 200, 200);
     textfield_widget_->Init(params);
     View* container = new View();
@@ skipping 214 matching lines @@
   std::unique_ptr<ViewsTouchEditingControllerFactory> views_tsc_factory_;
   std::unique_ptr<aura::test::TestCursorClient> test_cursor_client_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TouchSelectionControllerImplTest);
 };
 
 // Tests that the selection handles are placed appropriately when selection in
 // a Textfield changes.
 TEST_F(TouchSelectionControllerImplTest, SelectionInTextfieldTest) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   CreateTextfield();
   textfield_->SetText(ASCIIToUTF16("some text"));
   // Tap the textfield to invoke touch selection.
   ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
   details.set_tap_count(1);
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(), details);
   textfield_->OnGestureEvent(&tap);
 
   // Test selecting a range.
   textfield_->SelectRange(gfx::Range(3, 7));
@@ skipping 13 matching lines @@
 
   // Test with focus re-gained.
   textfield_widget_->GetFocusManager()->SetFocusedView(textfield_);
   EXPECT_FALSE(GetSelectionController());
   textfield_->OnGestureEvent(&tap);
   VerifyHandlePositions(false, true, FROM_HERE);
 }
 
 // Tests that the selection handles are placed appropriately in bidi text.
 TEST_F(TouchSelectionControllerImplTest, SelectionInBidiTextfieldTest) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   CreateTextfield();
   textfield_->SetText(WideToUTF16(L"abc\x05d0\x05d1\x05d2"));
   // Tap the textfield to invoke touch selection.
   ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
   details.set_tap_count(1);
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(), details);
   textfield_->OnGestureEvent(&tap);
 
   // Test cursor at run boundary and with empty selection.
   textfield_->SelectSelectionModel(
@@ skipping 32 matching lines @@
   textfield_->SelectRange(gfx::Range(1, 4));
   VerifyHandlePositions(false, true, FROM_HERE);
 
   textfield_->SelectRange(gfx::Range(4, 1));
   VerifyHandlePositions(false, true, FROM_HERE);
 }
 
 // Tests if the SelectRect callback is called appropriately when selection
 // handles are moved.
 TEST_F(TouchSelectionControllerImplTest, SelectRectCallbackTest) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   CreateTextfield();
   textfield_->SetText(ASCIIToUTF16("textfield with selected text"));
   // Tap the textfield to invoke touch selection.
   ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
   details.set_tap_count(1);
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(), details);
   textfield_->OnGestureEvent(&tap);
   textfield_->SelectRange(gfx::Range(3, 7));
 
   gfx::Point textfield_origin;
@@ skipping 22 matching lines @@
   VerifyHandlePositions(true, true, FROM_HERE);
 
   // Drag selection handle 2 across selection handle 1.
   x = gfx::Canvas::GetStringWidth(ASCIIToUTF16("with selected "), font_list);
   SimulateSelectionHandleDrag(gfx::Vector2d(x, 0), 2);
   EXPECT_EQ("selected ", UTF16ToUTF8(textfield_->GetSelectedText()));
   VerifyHandlePositions(false, true, FROM_HERE);
 }
 
 TEST_F(TouchSelectionControllerImplTest, SelectRectInBidiCallbackTest) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   CreateTextfield();
   textfield_->SetText(WideToUTF16(L"abc\x05e1\x05e2\x05e3" L"def"));
   // Tap the textfield to invoke touch selection.
   ui::GestureEventDetails details(ui::ET_GESTURE_TAP);
   details.set_tap_count(1);
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(), details);
   textfield_->OnGestureEvent(&tap);
 
   // Select [c] from left to right.
   textfield_->SelectRange(gfx::Range(2, 3));
@@ skipping 108 matching lines @@
 
   // Drag selection handle 2 to right by 1 char.
   x = gfx::Canvas::GetStringWidth(WideToUTF16(L"\x05e2"), font_list);
   SimulateSelectionHandleDrag(gfx::Vector2d(x, 0), 2);
   EXPECT_EQ(WideToUTF16(L"c\x05e1"), textfield_->GetSelectedText());
   VerifyHandlePositions(false, false, FROM_HERE);
 }
 
 TEST_F(TouchSelectionControllerImplTest,
        HiddenSelectionHandleRetainsCursorPosition) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.

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

optional nit: Move the meaty comment to SetUp and make these just: 
  // See comment in SetUp().

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

Done.

+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   static const uint32_t selection_start = 10u;
   SetupSelectionInvisibleHandle(selection_start);
   // Drag the visible handle around and make sure the selection end point of the
   // invisible handle does not change.
   size_t visible_handle_position = textfield_->GetSelectedRange().end();
   for (int i = 0; i < 10; ++i) {
     static const int drag_diff = -10;
     SimulateSelectionHandleDrag(gfx::Vector2d(drag_diff, 0), 2);
     // Make sure that the visible handle is being dragged.
     EXPECT_NE(visible_handle_position, textfield_->GetSelectedRange().end());
     visible_handle_position = textfield_->GetSelectedRange().end();
     EXPECT_EQ((size_t) 10, textfield_->GetSelectedRange().start());
   }
 }
 
 // Tests that we can handle the hidden handle getting exposed as a result of a
 // drag and that it maintains the correct orientation when exposed.
 TEST_F(TouchSelectionControllerImplTest, HiddenSelectionHandleExposed) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   static const uint32_t selection_start = 0u;
   SetupSelectionInvisibleHandle(selection_start);
 
   // Drag the handle until the selection shrinks such that the other handle
   // becomes visible.
   while (!IsSelectionHandle1Visible()) {
     static const int drag_diff = -10;
     SimulateSelectionHandleDrag(gfx::Vector2d(drag_diff, 0), 2);
   }
 
   // Confirm that the exposed handle maintains the LEFT orientation
   // (and does not reset to gfx::SelectionBound::Type::CENTER).
   EXPECT_EQ(gfx::SelectionBound::Type::LEFT, GetSelectionHandle1Type());
 }
 
 TEST_F(TouchSelectionControllerImplTest,
        DoubleTapInTextfieldWithCursorHandleShouldSelectText) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   CreateTextfield();
   textfield_->SetText(ASCIIToUTF16("some text"));
   ui::test::EventGenerator generator(
       textfield_->GetWidget()->GetNativeView()->GetRootWindow());
 
   // Tap the textfield to invoke touch selection.
   generator.GestureTapAt(gfx::Point(10, 10));
 
   // Cursor handle should be visible.
   EXPECT_FALSE(textfield_->HasSelection());
@@ skipping 79 matching lines @@
   //gfx::Rect cursor_rect_;
   gfx::SelectionBound cursor_bound_;
 
   DISALLOW_COPY_AND_ASSIGN(TestTouchEditable);
 };
 
 // Tests if the touch editing handle is shown or hidden properly according to
 // the cursor position relative to the client boundaries.
 TEST_F(TouchSelectionControllerImplTest,
        VisibilityOfHandleRegardingClientBounds) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   CreateWidget();
 
   TestTouchEditable touch_editable(widget_->GetNativeView());
   std::unique_ptr<ui::TouchEditingControllerDeprecated>
       touch_selection_controller(
           ui::TouchEditingControllerDeprecated::Create(&touch_editable));
 
   touch_editable.set_bounds(gfx::Rect(0, 0, 100, 20));
 
   // Put the cursor completely inside the client bounds. Handle should be
@@ skipping 27 matching lines @@
   // out of the client bounds. Handle should be hidden.
   touch_editable.set_cursor_rect(
       gfx::RectF(2.f, kBarBottomAllowance + 1.f, 1.f, 20.f));
   touch_selection_controller->SelectionChanged();
   EXPECT_FALSE(IsCursorHandleVisibleFor(touch_selection_controller.get()));
 
   touch_selection_controller.reset();
 }
 
 TEST_F(TouchSelectionControllerImplTest, HandlesStackAboveParent) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   ui::EventTarget* root = GetContext();
   ui::EventTargeter* targeter = root->GetEventTargeter();
 
   // Create the first window containing a Views::Textfield.
   CreateTextfield();
   aura::Window* window1 = textfield_widget_->GetNativeView();
 
   // Start touch editing, check that the handle is above the first window, and
   // end touch editing.
   StartTouchEditing();
@@ skipping 18 matching lines @@
   // Move the first window to top and check that the handle is kept above the
   // first window.
   window1->GetRootWindow()->StackChildAtTop(window1);
   ui::MouseEvent test_event3(ui::ET_MOUSE_MOVED, test_point, test_point,
                              ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
   EXPECT_EQ(GetCursorHandleNativeView(),
             targeter->FindTargetForEvent(root, &test_event3));
 }
 
 TEST_F(TouchSelectionControllerImplTest, MouseEventDeactivatesTouchSelection) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   CreateTextfield();
   EXPECT_FALSE(GetSelectionController());
 
   ui::test::EventGenerator generator(
       textfield_widget_->GetNativeView()->GetRootWindow());
 
   generator.set_current_location(gfx::Point(5, 5));
   RunPendingMessages();
 
   // Start touch editing; then move mouse over the textfield and ensure it
@@ skipping 21 matching lines @@
   // Start touch editing; then move mouse out of the textfield and window and
   // ensure it deactivates touch selection.
   StartTouchEditing();
   EXPECT_TRUE(GetSelectionController());
   generator.MoveMouseTo(5, 505);
   RunPendingMessages();
   EXPECT_FALSE(GetSelectionController());
 }
 
 TEST_F(TouchSelectionControllerImplTest, MouseCaptureChangedEventIgnored) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   CreateTextfield();
   EXPECT_FALSE(GetSelectionController());
 
   ui::test::EventGenerator generator(
       textfield_widget_->GetNativeView()->GetRootWindow());
   RunPendingMessages();
 
   // Start touch editing; then generate a mouse-capture-changed event and ensure
   // it does not deactivate touch selection.
   StartTouchEditing();
   EXPECT_TRUE(GetSelectionController());
   ui::MouseEvent capture_changed(ui::ET_MOUSE_CAPTURE_CHANGED, gfx::Point(5, 5),
                                  gfx::Point(5, 5), base::TimeTicks(), 0, 0);
   generator.Dispatch(&capture_changed);
   RunPendingMessages();
   EXPECT_TRUE(GetSelectionController());
 }
 
 TEST_F(TouchSelectionControllerImplTest, KeyEventDeactivatesTouchSelection) {
+  // TODO: test uses GetContext(), which is not applicable to aura-mus.
+  // http://crbug.com/663809.
+  if (IsAuraMusClient())
+    return;
+
   CreateTextfield();
   EXPECT_FALSE(GetSelectionController());
 
   ui::test::EventGenerator generator(
       textfield_widget_->GetNativeView()->GetRootWindow());
 
   RunPendingMessages();
 
   // Start touch editing; then press a key and ensure it deactivates touch
   // selection.
   StartTouchEditing();
   EXPECT_TRUE(GetSelectionController());
   generator.PressKey(ui::VKEY_A, 0);
   RunPendingMessages();
   EXPECT_FALSE(GetSelectionController());
 }
 
 }  // namespace views