| Index: ash/drag_drop/drag_drop_tracker_unittest.cc
|
| diff --git a/ash/drag_drop/drag_drop_tracker_unittest.cc b/ash/drag_drop/drag_drop_tracker_unittest.cc
|
| index 6b470e89c544b0ef5d3f34e127dd31ad04cd6087..f3e56905bf9a99164981e781ee8e3766aff715ad 100644
|
| --- a/ash/drag_drop/drag_drop_tracker_unittest.cc
|
| +++ b/ash/drag_drop/drag_drop_tracker_unittest.cc
|
| @@ -151,8 +151,8 @@ TEST_F(DragDropTrackerTest, MAYBE_ConvertEvent) {
|
| scoped_ptr<ui::LocatedEvent> converted00(ConvertEvent(window0.get(),
|
| original00));
|
| EXPECT_EQ(original00.type(), converted00->type());
|
| - EXPECT_EQ("50,50", converted00->location().ToString());
|
| - EXPECT_EQ("50,50", converted00->root_location().ToString());
|
| + EXPECT_EQ(gfx::PointF(50, 50), converted00->location());
|
| + EXPECT_EQ(gfx::PointF(50, 50), converted00->root_location());
|
| EXPECT_EQ(original00.flags(), converted00->flags());
|
|
|
| // Start tracking from the RootWindow0 and converts the mouse event into
|
| @@ -165,8 +165,8 @@ TEST_F(DragDropTrackerTest, MAYBE_ConvertEvent) {
|
| scoped_ptr<ui::LocatedEvent> converted01(ConvertEvent(window1.get(),
|
| original01));
|
| EXPECT_EQ(original01.type(), converted01->type());
|
| - EXPECT_EQ("50,50", converted01->location().ToString());
|
| - EXPECT_EQ("150,150", converted01->root_location().ToString());
|
| + EXPECT_EQ(gfx::PointF(50, 50), converted01->location());
|
| + EXPECT_EQ(gfx::PointF(150, 150), converted01->root_location());
|
| EXPECT_EQ(original01.flags(), converted01->flags());
|
|
|
| // Make RootWindow1 active so that capture window is parented to it.
|
| @@ -182,8 +182,8 @@ TEST_F(DragDropTrackerTest, MAYBE_ConvertEvent) {
|
| scoped_ptr<ui::LocatedEvent> converted10(ConvertEvent(window0.get(),
|
| original10));
|
| EXPECT_EQ(original10.type(), converted10->type());
|
| - EXPECT_EQ("50,50", converted10->location().ToString());
|
| - EXPECT_EQ("50,50", converted10->root_location().ToString());
|
| + EXPECT_EQ(gfx::PointF(50, 50), converted10->location());
|
| + EXPECT_EQ(gfx::PointF(50, 50), converted10->root_location());
|
| EXPECT_EQ(original10.flags(), converted10->flags());
|
|
|
| // Start tracking from the RootWindow1 and converts the mouse event into
|
| @@ -196,8 +196,8 @@ TEST_F(DragDropTrackerTest, MAYBE_ConvertEvent) {
|
| scoped_ptr<ui::LocatedEvent> converted11(ConvertEvent(window1.get(),
|
| original11));
|
| EXPECT_EQ(original11.type(), converted11->type());
|
| - EXPECT_EQ("50,50", converted11->location().ToString());
|
| - EXPECT_EQ("150,150", converted11->root_location().ToString());
|
| + EXPECT_EQ(gfx::PointF(50, 50), converted11->location());
|
| + EXPECT_EQ(gfx::PointF(150, 150), converted11->root_location());
|
| EXPECT_EQ(original11.flags(), converted11->flags());
|
| }
|
|
|
|
|