Remove unnecessary |show_on_tap_for_empty_editable| flag

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 <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 88 matching lines @@
     events_.push_back(event);
     last_event_start_ = controller_->GetStartPosition();
     last_event_end_ = controller_->GetEndPosition();
     last_event_bounds_rect_ = controller_->GetRectBetweenBounds();
   }
 
   std::unique_ptr<TouchHandleDrawable> CreateDrawable() override {
     return base::WrapUnique(new MockTouchHandleDrawable(&dragging_enabled_));
   }
 
-  void AllowShowingOnTapForEmptyEditable() {
-    TouchSelectionController::Config config = DefaultConfig();
-    config.show_on_tap_for_empty_editable = true;
-    controller_.reset(new TouchSelectionController(this, config));
-  }
-
   void EnableLongPressDragSelection() {
     TouchSelectionController::Config config = DefaultConfig();
     config.enable_longpress_drag_selection = true;
     controller_.reset(new TouchSelectionController(this, config));
   }
 
   void SetAnimationEnabled(bool enabled) { animation_enabled_ = enabled; }
   void SetDraggingEnabled(bool enabled) { dragging_enabled_ = enabled; }
 
   void ClearSelection() {
@@ skipping 82 matching lines @@
   std::vector<SelectionEventType> GetAndResetEvents() {
     std::vector<SelectionEventType> events;
     events.swap(events_);
     return events;
   }
 
   TouchSelectionController& controller() { return *controller_; }
 
  private:
   TouchSelectionController::Config DefaultConfig() {
-    // Both |show_on_tap_for_empty_editable| and
-    // |enable_longpress_drag_selection| are set to false by default, and should
+    // |enable_longpress_drag_selection| is set to false by default, and should
     // be overriden for explicit testing.
     TouchSelectionController::Config config;
     config.max_tap_duration =
         base::TimeDelta::FromMilliseconds(kDefaultTapTimeoutMs);
     config.tap_slop = kDefaulTapSlop;
-    config.show_on_tap_for_empty_editable = false;
     config.enable_longpress_drag_selection = false;
     return config;
   }
 
   gfx::PointF last_event_start_;
   gfx::PointF last_event_end_;
   gfx::PointF caret_position_;
   gfx::PointF selection_start_;
   gfx::PointF selection_end_;
   gfx::RectF last_event_bounds_rect_;
@@ skipping 54 matching lines @@
 
   ChangeInsertion(insertion_rect, visible);
   EXPECT_THAT(GetAndResetEvents(),
               ElementsAre(SELECTION_ESTABLISHED, INSERTION_HANDLE_SHOWN));
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart());
 
   controller().OnSelectionEditable(false);
   EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_HANDLE_CLEARED));
 }
 
 TEST_F(TouchSelectionControllerTest, InsertionWithNoShowOnTapForEmptyEditable) {

[mohsen, 2016/08/10 21:09:53]

nit: Please remove the reference to the removed flag from the test name (e.g.
InsertionForEmptyEditable?).

   gfx::RectF insertion_rect(5, 5, 0, 10);
   bool visible = true;
   controller().OnSelectionEditable(true);
 
-  // Taps on an empty editable region should be ignored if the controller is
-  // created with |show_on_tap_for_empty_editable| set to false.
+  // Taps on an empty editable region should be ignored
   OnTapEvent();
   controller().OnSelectionEmpty(true);
   ChangeInsertion(insertion_rect, visible);
   EXPECT_EQ(gfx::PointF(), GetLastEventStart());
 
   // Once the region becomes non-empty, taps should show the insertion handle.
   OnTapEvent();
   controller().OnSelectionEmpty(false);
   ChangeInsertion(insertion_rect, visible);
   EXPECT_THAT(GetAndResetEvents(),
@@ skipping 10 matching lines @@
   controller().OnSelectionEmpty(true);
   ChangeInsertion(insertion_rect, visible);
   EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_HANDLE_SHOWN));
   EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart());
 
   // Single Tap on an empty edit field should clear insertion handle.
   OnTapEvent();
   EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_HANDLE_CLEARED));
 }
 
-TEST_F(TouchSelectionControllerTest, InsertionWithShowOnTapForEmptyEditable) {
-  AllowShowingOnTapForEmptyEditable();
-
-  gfx::RectF insertion_rect(5, 5, 0, 10);
-  bool visible = true;
-  controller().OnSelectionEditable(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.
-  OnTapEvent();
-  controller().OnSelectionEmpty(true);
-  ChangeInsertion(insertion_rect, visible);
-  EXPECT_THAT(GetAndResetEvents(),
-              ElementsAre(SELECTION_ESTABLISHED, INSERTION_HANDLE_SHOWN));
-  EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart());
-
-  // Additional taps should not hide the insertion handle in this case.
-  OnTapEvent();
-  ChangeInsertion(insertion_rect, visible);
-  EXPECT_THAT(GetAndResetEvents(), IsEmpty());
-}
-
 TEST_F(TouchSelectionControllerTest, InsertionAppearsAfterTapFollowingTyping) {
   gfx::RectF insertion_rect(5, 5, 0, 10);
   bool visible = true;
 
   // Simulate the user tapping an empty text field.
   OnTapEvent();
   controller().OnSelectionEditable(true);
   controller().OnSelectionEmpty(true);
   ChangeInsertion(insertion_rect, visible);
   EXPECT_EQ(gfx::PointF(), GetLastEventStart());
@@ skipping 1107 matching lines @@
                           offset_rect.x(), offset_rect.bottom());
   EXPECT_TRUE(controller().WillHandleTouchEvent(event));
   EXPECT_THAT(GetAndResetEvents(), ElementsAre(SELECTION_HANDLE_DRAG_STOPPED));
   EXPECT_EQ(test_controller.GetStartHandleOrientation(),
             TouchHandleOrientation::LEFT);
   EXPECT_EQ(test_controller.GetEndHandleOrientation(),
             TouchHandleOrientation::RIGHT);
 }
 
 }  // namespace ui