Reland: Implement Aura side of unified touch text selection for contents

ui/touch_selection/touch_selection_controller_unittest.cc

 // Copyright 2014 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/touch_selection/touch_selection_controller.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/test/motion_event_test_utils.h"
 
 using ui::test::MockMotionEvent;
@@ skipping 33 matching lines @@
         selection_moved_(false),
         selection_points_swapped_(false),
         needs_animate_(false),
         animation_enabled_(true),
         dragging_enabled_(false) {}
 
   ~TouchSelectionControllerTest() override {}
 
   // testing::Test implementation.
   void SetUp() override {
-    controller_.reset(new TouchSelectionController(
-        this,
-        base::TimeDelta::FromMilliseconds(kDefaultTapTimeoutMs),
-        kDefaulTapSlop));
+    Reset(false);
   }
 
   void TearDown() override { controller_.reset(); }
 
   // TouchSelectionControllerClient implementation.
 
   bool SupportsAnimation() const override { return animation_enabled_; }
 
   void SetNeedsAnimate() override { needs_animate_ = true; }
 
@@ skipping 20 matching lines @@
                         const gfx::PointF& end_position) override {
     last_event_ = event;
     last_event_start_ = end_position;
   }
 
   scoped_ptr<TouchHandleDrawable> CreateDrawable() override {
     return scoped_ptr<TouchHandleDrawable>(
         new MockTouchHandleDrawable(&dragging_enabled_));
   }
 
+  void Reset(bool show_on_tap_for_empty_editable) {
+    controller_.reset(new TouchSelectionController(
+        this,
+        base::TimeDelta::FromMilliseconds(kDefaultTapTimeoutMs),
+        kDefaulTapSlop,
+        show_on_tap_for_empty_editable));
+    last_event_start_ = gfx::PointF();
+    caret_position_ = gfx::PointF();
+    selection_start_ = gfx::PointF();
+    selection_end_ = gfx::PointF();
+    last_event_ = SELECTION_CLEARED;
+    caret_moved_ = false;
+    selection_moved_ = false;
+    selection_points_swapped_ = false;
+    needs_animate_ = false;
+    animation_enabled_ = true;
+    dragging_enabled_ = false;
+}
+
   void SetAnimationEnabled(bool enabled) { animation_enabled_ = enabled; }
   void SetDraggingEnabled(bool enabled) { dragging_enabled_ = enabled; }
 
   void ClearSelection() {
-    controller_->OnSelectionBoundsChanged(SelectionBound(),
+    controller_->OnSelectionBoundsUpdated(SelectionBound(),
                                           SelectionBound());
   }
 
   void ClearInsertion() { ClearSelection(); }
 
   void ChangeInsertion(const gfx::RectF& rect, bool visible) {
     SelectionBound bound;
     bound.set_type(SelectionBound::CENTER);
     bound.SetEdge(rect.origin(), rect.bottom_left());
     bound.set_visible(visible);
-    controller_->OnSelectionBoundsChanged(bound, bound);
+    controller_->OnSelectionBoundsUpdated(bound, bound);
   }
 
   void ChangeSelection(const gfx::RectF& start_rect,
                        bool start_visible,
                        const gfx::RectF& end_rect,
                        bool end_visible) {
     SelectionBound start_bound, end_bound;
     start_bound.set_type(SelectionBound::LEFT);
     end_bound.set_type(SelectionBound::RIGHT);
     start_bound.SetEdge(start_rect.origin(), start_rect.bottom_left());
     end_bound.SetEdge(end_rect.origin(), end_rect.bottom_left());
     start_bound.set_visible(start_visible);
     end_bound.set_visible(end_visible);
-    controller_->OnSelectionBoundsChanged(start_bound, end_bound);
+    controller_->OnSelectionBoundsUpdated(start_bound, end_bound);
   }
 
   void Animate() {
     base::TimeTicks now = base::TimeTicks::Now();
     while (needs_animate_) {
       needs_animate_ = controller_->Animate(now);
       now += base::TimeDelta::FromMilliseconds(16);
     }
   }
 
@@ skipping 18 matching lines @@
   bool GetAndResetSelectionPointsSwapped() {
     bool swapped = selection_points_swapped_;
     selection_points_swapped_ = false;
     return swapped;
   }
 
   const gfx::PointF& GetLastCaretPosition() const { return caret_position_; }
   const gfx::PointF& GetLastSelectionStart() const { return selection_start_; }
   const gfx::PointF& GetLastSelectionEnd() const { return selection_end_; }
   SelectionEventType GetLastEventType() const { return last_event_; }
-  const gfx::PointF& GetLastEventAnchor() const { return last_event_start_; }
+  const gfx::PointF& GetLastEventAnchor() { return last_event_start_; }
 
   TouchSelectionController& controller() { return *controller_; }
 
  private:
   gfx::PointF last_event_start_;
   gfx::PointF caret_position_;
   gfx::PointF selection_start_;
   gfx::PointF selection_end_;
   SelectionEventType last_event_;
   bool caret_moved_;
@@ skipping 45 matching lines @@
   controller().OnSelectionEditable(true);
 
   ChangeInsertion(insertion_rect, visible);
   EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 
   controller().OnSelectionEditable(false);
   EXPECT_EQ(INSERTION_CLEARED, GetLastEventType());
 }
 
-TEST_F(TouchSelectionControllerTest, InsertionStaysHiddenIfEmptyRegionTapped) {
+TEST_F(TouchSelectionControllerTest, EmptyRegionTapped) {
   gfx::RectF insertion_rect(5, 5, 0, 10);
   bool visible = true;
+
+  // Taps on an empty editable region should show the insertion handle if the
+  // controller is created with show_on_tap_for_empty_editable set to true.
+  Reset(true);
   controller().OnSelectionEditable(true);
+  controller().OnTapEvent();
+  controller().OnSelectionEmpty(true);
+  ChangeInsertion(insertion_rect, visible);
+  EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
+  EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 
-  // Taps should be ignored if they're in an empty editable region.
+  // Taps on an empty editable region should be ignored if the controller is
+  // created with show_on_tap_for_empty_editable set to false.
+  Reset(false);
+  controller().OnSelectionEditable(true);
   controller().OnTapEvent();
   controller().OnSelectionEmpty(true);
   ChangeInsertion(insertion_rect, visible);
   EXPECT_EQ(gfx::PointF(), GetLastEventAnchor());
 
-  // Once the region becomes editable, taps should show the insertion handle.
+  // Once the region becomes non-empty, taps should show the insertion handle.
   controller().OnTapEvent();
   controller().OnSelectionEmpty(false);
   ChangeInsertion(insertion_rect, visible);
   EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 
   // Reset the selection.
   controller().HideAndDisallowShowingAutomatically();
   EXPECT_EQ(INSERTION_CLEARED, GetLastEventType());
 
@@ skipping 580 matching lines @@
   controller().OnSelectionEmpty(false);
   controller().HideAndDisallowShowingAutomatically();
   gfx::RectF insertion_rect(5, 5, 0, 10);
   ChangeInsertion(insertion_rect, visible);
   controller().AllowShowingFromCurrentSelection();
   EXPECT_EQ(INSERTION_SHOWN, GetLastEventType());
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventAnchor());
 }
 
 }  // namespace ui