gfx: Make conversions from gfx::Point to PointF explicit.

ui/gfx/geometry/point_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 "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/point_f.h"
 
 namespace gfx {
 
-namespace {
+TEST(PointTest, ToPointF) {
+  // Check that explicit conversion from integer to float compiles.
+  Point a(10, 20);
+  PointF b = PointF(a);
 
-int TestPointF(const PointF& p) {
-  return p.x();
-}
-
-}  // namespace
-
-TEST(PointTest, ToPointF) {
-  // Check that implicit conversion from integer to float compiles.
-  Point a(10, 20);
-  float x = TestPointF(a);
-  EXPECT_EQ(x, a.x());
-
-  PointF b(10, 20);
-  EXPECT_EQ(a, b);
-  EXPECT_EQ(b, a);
+  EXPECT_EQ(static_cast<float>(a.x()), b.x());
+  EXPECT_EQ(static_cast<float>(a.y()), b.y());
 }
 
 TEST(PointTest, IsOrigin) {
   EXPECT_FALSE(Point(1, 0).IsOrigin());
   EXPECT_FALSE(Point(0, 1).IsOrigin());
   EXPECT_FALSE(Point(1, 2).IsOrigin());
   EXPECT_FALSE(Point(-1, 0).IsOrigin());
   EXPECT_FALSE(Point(0, -1).IsOrigin());
   EXPECT_FALSE(Point(-1, -2).IsOrigin());
   EXPECT_TRUE(Point(0, 0).IsOrigin());
@@ skipping 49 matching lines @@
   EXPECT_EQ(Point(11, 11), ToRoundedPoint(PointF(10.9999f, 10.9999f)));
 
   EXPECT_EQ(Point(-10, -10), ToRoundedPoint(PointF(-10, -10)));
   EXPECT_EQ(Point(-10, -10), ToRoundedPoint(PointF(-10.0001f, -10.0001f)));
   EXPECT_EQ(Point(-10, -10), ToRoundedPoint(PointF(-10.4999f, -10.4999f)));
   EXPECT_EQ(Point(-11, -11), ToRoundedPoint(PointF(-10.5f, -10.5f)));
   EXPECT_EQ(Point(-11, -11), ToRoundedPoint(PointF(-10.9999f, -10.9999f)));
 }
 
 TEST(PointTest, Scale) {
-  EXPECT_EQ(PointF().ToString(), ScalePoint(Point(), 2).ToString());
-  EXPECT_EQ(PointF().ToString(), ScalePoint(Point(), 2, 2).ToString());
+  EXPECT_EQ(PointF().ToString(), ScalePoint(PointF(), 2).ToString());
+  EXPECT_EQ(PointF().ToString(), ScalePoint(PointF(), 2, 2).ToString());
 
+  EXPECT_EQ(PointF(2, -2).ToString(), ScalePoint(PointF(1, -1), 2).ToString());
   EXPECT_EQ(PointF(2, -2).ToString(),
-            ScalePoint(Point(1, -1), 2).ToString());
-  EXPECT_EQ(PointF(2, -2).ToString(),
-            ScalePoint(Point(1, -1), 2, 2).ToString());
+            ScalePoint(PointF(1, -1), 2, 2).ToString());
 
   PointF zero;
   PointF one(1, -1);
 
   zero.Scale(2);
   zero.Scale(3, 1.5);
 
   one.Scale(2);
   one.Scale(3, 1.5);
 
@@ skipping 47 matching lines @@
   EXPECT_EQ(PointF(8.5f, 10.5f).ToString(), a.ToString());
   a.SetToMin(PointF(11.5f, 9.5f));
   EXPECT_EQ(PointF(8.5f, 9.5f).ToString(), a.ToString());
   a.SetToMin(PointF(7.5f, 11.5f));
   EXPECT_EQ(PointF(7.5f, 9.5f).ToString(), a.ToString());
   a.SetToMin(PointF(3.5f, 5.5f));
   EXPECT_EQ(PointF(3.5f, 5.5f).ToString(), a.ToString());
 }
 
 }  // namespace gfx