Replace views::LocatedEvent with ui::LocatedEvent

ui/views/view_unittest.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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 923 matching lines @@
   }
 
  private:
   bool has_hittest_mask_;
 
   DISALLOW_COPY_AND_ASSIGN(HitTestView);
 };
 
 gfx::Point ConvertPointToView(View* view, const gfx::Point& p) {
   gfx::Point tmp(p);
-  View::ConvertPointToView(view->GetWidget()->GetRootView(), view, &tmp);
+  View::ConvertPointToTarget(view->GetWidget()->GetRootView(), view, &tmp);
   return tmp;
 }
 
 gfx::Rect ConvertRectToView(View* view, const gfx::Rect& r) {
   gfx::Rect tmp(r);
   tmp.set_origin(ConvertPointToView(view, r.origin()));
   return tmp;
 }
 
 void RotateCounterclockwise(ui::Transform* transform) {
@@ skipping 1409 matching lines @@
     EXPECT_EQ(-55, matrix.getTranslateY());
     EXPECT_EQ(100, matrix.getScaleX());
     EXPECT_EQ(55, matrix.getScaleY());
     EXPECT_EQ(0, matrix.getSkewX());
     EXPECT_EQ(0, matrix.getSkewY());
   }
 
   // Conversions from child->top and top->child.
   {
     gfx::Point point(5, 5);
-    View::ConvertPointToView(child, &top_view, &point);
+    View::ConvertPointToTarget(child, &top_view, &point);
     EXPECT_EQ(22, point.x());
     EXPECT_EQ(39, point.y());
 
     point.SetPoint(22, 39);
-    View::ConvertPointToView(&top_view, child, &point);
+    View::ConvertPointToTarget(&top_view, child, &point);
     EXPECT_EQ(5, point.x());
     EXPECT_EQ(5, point.y());
   }
 
   // Conversions from child_child->top and top->child_child.
   {
     gfx::Point point(5, 5);
-    View::ConvertPointToView(child_child, &top_view, &point);
+    View::ConvertPointToTarget(child_child, &top_view, &point);
     EXPECT_EQ(133, point.x());
     EXPECT_EQ(211, point.y());
 
     point.SetPoint(133, 211);
-    View::ConvertPointToView(&top_view, child_child, &point);
+    View::ConvertPointToTarget(&top_view, child_child, &point);
     EXPECT_EQ(5, point.x());
     EXPECT_EQ(5, point.y());
   }
 
   // Conversions from child_child->child and child->child_child
   {
     gfx::Point point(5, 5);
-    View::ConvertPointToView(child_child, child, &point);
+    View::ConvertPointToTarget(child_child, child, &point);
     EXPECT_EQ(42, point.x());
     EXPECT_EQ(48, point.y());
 
     point.SetPoint(42, 48);
-    View::ConvertPointToView(child, child_child, &point);
+    View::ConvertPointToTarget(child, child_child, &point);
     EXPECT_EQ(5, point.x());
     EXPECT_EQ(5, point.y());
   }
 
   // Conversions from top_view to child with a value that should be negative.
   // This ensures we don't round up with negative numbers.
   {
     gfx::Point point(6, 18);
-    View::ConvertPointToView(&top_view, child, &point);
+    View::ConvertPointToTarget(&top_view, child, &point);
     EXPECT_EQ(-1, point.x());
     EXPECT_EQ(-1, point.y());
   }
 }
 
 // Tests conversion methods for rectangles.
 TEST_F(ViewTest, ConvertRectWithTransform) {
   scoped_ptr<Widget> widget(new Widget);
   Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
@@ skipping 936 matching lines @@
   // Set to non default value.
   v->layer()->set_scale_content(false);
   scoped_ptr<ui::Layer> old_layer(v->RecreateLayer());
   ui::Layer* new_layer = v->layer();
   EXPECT_FALSE(new_layer->scale_content());
 }
 
 #endif  // USE_AURA
 
 }  // namespace views