Merge 279991 "[Android] Select text when stylus first button is ..."

ui/events/gesture_detection/velocity_tracker_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 "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/events/gesture_detection/mock_motion_event.h"
 #include "ui/events/gesture_detection/velocity_tracker_state.h"
+#include "ui/events/test/mock_motion_event.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/vector2d_f.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
+using ui::test::MockMotionEvent;
 
 namespace ui {
 namespace {
 
 const TimeDelta kTenMillis = TimeDelta::FromMilliseconds(10);
 const TimeDelta kOneSecond = TimeDelta::FromSeconds(1);
 const float kEpsilson = .01f;
 
 const char* GetStrategyName(VelocityTracker::Strategy strategy) {
   switch (strategy) {
@@ skipping 157 matching lines @@
     // The computed velocity should have increased.
     state.ComputeCurrentVelocity(1000, 20000);
     vCurrentY = state.GetYVelocity(0);
     EXPECT_LT(vSlow.y(), vCurrentY);
     EXPECT_LT(vOldY, vCurrentY);
   }
 }
 
 
 }  // namespace ui