Merge 285785 "Show handles even when dragging from outside selec..."

content/browser/renderer_host/input/gesture_text_selector_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 <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "content/browser/renderer_host/input/gesture_text_selector.h"
@@ skipping 124 matching lines @@
       x2, y2, x2, y2, 1, gfx::RectF(0, 0, 0, 0));
   EXPECT_TRUE(selector_->OnGestureEvent(double_tap));
   EXPECT_TRUE(event_log_.empty());
 
   // 4. ET_GESTURE_SCROLL_BEGIN
   event_time += base::TimeDelta::FromMilliseconds(10);
   const GestureEventData scroll_begin(
       GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN, 0, 0), 0, event_time,
       x1, y1, x1, y1, 1, gfx::RectF(0, 0, 0, 0));
   EXPECT_TRUE(selector_->OnGestureEvent(scroll_begin));
-  EXPECT_EQ(2u, event_log_.size());  // Unselect, Show
-  EXPECT_STREQ("Show", event_log_.back().c_str());
+  EXPECT_EQ(1u, event_log_.size());  // Unselect
 
   // 5. ET_GESTURE_SCROLL_UPDATE
   event_time += base::TimeDelta::FromMilliseconds(10);
   const GestureEventData scroll_update(
       GestureEventDetails(ui::ET_GESTURE_SCROLL_UPDATE, 0, 0), 0, event_time,
       x2, y2, x2, y2, 1, gfx::RectF(0, 0, 0, 0));
   EXPECT_TRUE(selector_->OnGestureEvent(scroll_update));
   EXPECT_EQ(3u, event_log_.size());  // Unselect, Show, SelectRange
   EXPECT_STREQ("SelectRange", event_log_.back().c_str());
 
@@ skipping 51 matching lines @@
   action_up.SetButtonState(0);
   EXPECT_TRUE(selector_->OnTouchEvent(action_up));
   EXPECT_TRUE(event_log_.empty());
 
   // 4. TAP
   event_time += base::TimeDelta::FromMilliseconds(10);
   const GestureEventData tap(
       GestureEventDetails(ui::ET_GESTURE_TAP, 0, 0), 0, event_time,
       x1, y1, x1, y1, 1, gfx::RectF(0, 0, 0, 0));
   EXPECT_TRUE(selector_->OnGestureEvent(tap));
-  EXPECT_EQ(1u, event_log_.size());  // Unselect, Show
+  EXPECT_EQ(1u, event_log_.size());  // LongPress
   EXPECT_STREQ("LongPress", event_log_.back().c_str());
 }
 
 }  // namespace content