Fix long press touch selection on empty text fields

content/browser/renderer_host/input/touch_selection_controller_client_aura.cc

 // Copyright 2015 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 "content/browser/renderer_host/input/touch_selection_controller_client_aura.h"
 
 #include "base/macros.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
@@ skipping 138 matching lines @@
 }
 
 void TouchSelectionControllerClientAura::OnScrollCompleted() {
   scroll_in_progress_ = false;
   rwhva_->selection_controller()->SetTemporarilyHidden(false);
   UpdateQuickMenu();
 }
 
 bool TouchSelectionControllerClientAura::HandleContextMenu(
     const ContextMenuParams& params) {
-  if (params.source_type == ui::MENU_SOURCE_TOUCH && params.is_editable &&
-      params.selection_text.empty() && IsQuickMenuAvailable()) {
+  if (params.source_type == ui::MENU_SOURCE_LONG_PRESS &&
+      rwhva_->selection_controller()->insertion_active_or_requested() &&
+      IsQuickMenuAvailable()) {
+    DCHECK(params.is_editable);
+    DCHECK(params.selection_text.empty());
     quick_menu_requested_ = true;
     UpdateQuickMenu();
     return true;
   }
   rwhva_->selection_controller()->HideAndDisallowShowingAutomatically();
   return false;
 }
 
 bool TouchSelectionControllerClientAura::IsQuickMenuAvailable() const {
   return ui::TouchSelectionMenuRunner::GetInstance() &&
@@ skipping 196 matching lines @@
                                          ui::MENU_SOURCE_TOUCH_EDIT_MENU,
                                          gfx::ToRoundedPoint(anchor_point)));
 
   // Hide selection handles after getting rect-between-bounds from touch
   // selection controller; otherwise, rect would be empty and the above
   // calculations would be invalid.
   rwhva_->selection_controller()->HideAndDisallowShowingAutomatically();
 }
 
 }  // namespace content