[Android] Reland "Provide unhandled tap event notifications"

content/browser/web_contents/touch_editable_impl_aura_browsertest.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 "content/browser/web_contents/touch_editable_impl_aura.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
@@ skipping 351 matching lines @@
   aura::test::EventGenerator generator(content->GetRootWindow(), content);
   gfx::Rect bounds = content->GetBoundsInRootWindow();
   EXPECT_EQ(GetRenderWidgetHostViewAura(touch_editable), rwhva);
 
   ExecuteSyncJSFunction(main_frame, "focus_textfield()");
   touch_editable->WaitForSelectionChangeCallback();
 
   // Tap textfield
   touch_editable->Reset();
   generator.GestureTapAt(gfx::Point(bounds.x() + 50, bounds.y() + 40));
-  // Tap Down and Tap acks are sent synchronously.
+  // Tap Down acks are sent synchronously, while Tap acks are asynchronous.
+  touch_editable->Reset();
+  touch_editable->WaitForGestureAck();
   touch_editable->WaitForSelectionChangeCallback();
-  touch_editable->Reset();
 
   // Check if cursor handle is showing.
   EXPECT_NE(ui::TEXT_INPUT_TYPE_NONE, GetTextInputType(touch_editable));
   EXPECT_TRUE(GetTouchSelectionController(touch_editable));
 
   scoped_ptr<base::Value> value =
       content::ExecuteScriptAndGetValue(main_frame, "get_cursor_position()");
   int cursor_pos = -1;
   value->GetAsInteger(&cursor_pos);
   EXPECT_NE(-1, cursor_pos);
 
   // Move the cursor handle.
   generator.GestureScrollSequence(
       gfx::Point(50, 59),
       gfx::Point(10, 59),
       base::TimeDelta::FromMilliseconds(20),
       1);
   touch_editable->WaitForSelectionChangeCallback();
   EXPECT_TRUE(GetTouchSelectionController(touch_editable));
   value = content::ExecuteScriptAndGetValue(main_frame,
                                             "get_cursor_position()");
   int new_cursor_pos = -1;
   value->GetAsInteger(&new_cursor_pos);
   EXPECT_NE(-1, new_cursor_pos);
   // Cursor should have moved.
   EXPECT_NE(new_cursor_pos, cursor_pos);
 }
 
 }  // namespace content