Rename ClampToMin and ClampToMax

ui/gfx/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 "ui/gfx/point_base.h"
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/point_conversions.h"
@@ skipping 106 matching lines @@
 
   EXPECT_EQ(PointF().ToString(), zero.ToString());
   EXPECT_EQ(PointF(6, -3).ToString(), one.ToString());
 }
 
 TEST(PointTest, ClampPoint) {
   Point a;
 
   a = Point(3, 5);
   EXPECT_EQ(Point(3, 5).ToString(), a.ToString());
-  a.ClampToMin(Point(2, 4));
+  a.ClampToLowerBound(Point(2, 4));
   EXPECT_EQ(Point(3, 5).ToString(), a.ToString());
-  a.ClampToMin(Point(3, 5));
+  a.ClampToLowerBound(Point(3, 5));
   EXPECT_EQ(Point(3, 5).ToString(), a.ToString());
-  a.ClampToMin(Point(4, 2));
+  a.ClampToLowerBound(Point(4, 2));
   EXPECT_EQ(Point(4, 5).ToString(), a.ToString());
-  a.ClampToMin(Point(8, 10));
+  a.ClampToLowerBound(Point(8, 10));
   EXPECT_EQ(Point(8, 10).ToString(), a.ToString());
 
-  a.ClampToMax(Point(9, 11));
+  a.ClampToUpperBound(Point(9, 11));
   EXPECT_EQ(Point(8, 10).ToString(), a.ToString());
-  a.ClampToMax(Point(8, 10));
+  a.ClampToUpperBound(Point(8, 10));
   EXPECT_EQ(Point(8, 10).ToString(), a.ToString());
-  a.ClampToMax(Point(11, 9));
+  a.ClampToUpperBound(Point(11, 9));
   EXPECT_EQ(Point(8, 9).ToString(), a.ToString());
-  a.ClampToMax(Point(7, 11));
+  a.ClampToUpperBound(Point(7, 11));
   EXPECT_EQ(Point(7, 9).ToString(), a.ToString());
-  a.ClampToMax(Point(3, 5));
+  a.ClampToUpperBound(Point(3, 5));
   EXPECT_EQ(Point(3, 5).ToString(), a.ToString());
 }
 
 TEST(PointTest, ClampPointF) {
   PointF a;
 
   a = PointF(3.5f, 5.5f);
   EXPECT_EQ(PointF(3.5f, 5.5f).ToString(), a.ToString());
-  a.ClampToMin(PointF(2.5f, 4.5f));
+  a.ClampToLowerBound(PointF(2.5f, 4.5f));
   EXPECT_EQ(PointF(3.5f, 5.5f).ToString(), a.ToString());
-  a.ClampToMin(PointF(3.5f, 5.5f));
+  a.ClampToLowerBound(PointF(3.5f, 5.5f));
   EXPECT_EQ(PointF(3.5f, 5.5f).ToString(), a.ToString());
-  a.ClampToMin(PointF(4.5f, 2.5f));
+  a.ClampToLowerBound(PointF(4.5f, 2.5f));
   EXPECT_EQ(PointF(4.5f, 5.5f).ToString(), a.ToString());
-  a.ClampToMin(PointF(8.5f, 10.5f));
+  a.ClampToLowerBound(PointF(8.5f, 10.5f));
   EXPECT_EQ(PointF(8.5f, 10.5f).ToString(), a.ToString());
 
-  a.ClampToMax(PointF(9.5f, 11.5f));
+  a.ClampToUpperBound(PointF(9.5f, 11.5f));
   EXPECT_EQ(PointF(8.5f, 10.5f).ToString(), a.ToString());
-  a.ClampToMax(PointF(8.5f, 10.5f));
+  a.ClampToUpperBound(PointF(8.5f, 10.5f));
   EXPECT_EQ(PointF(8.5f, 10.5f).ToString(), a.ToString());
-  a.ClampToMax(PointF(11.5f, 9.5f));
+  a.ClampToUpperBound(PointF(11.5f, 9.5f));
   EXPECT_EQ(PointF(8.5f, 9.5f).ToString(), a.ToString());
-  a.ClampToMax(PointF(7.5f, 11.5f));
+  a.ClampToUpperBound(PointF(7.5f, 11.5f));
   EXPECT_EQ(PointF(7.5f, 9.5f).ToString(), a.ToString());
-  a.ClampToMax(PointF(3.5f, 5.5f));
+  a.ClampToUpperBound(PointF(3.5f, 5.5f));
   EXPECT_EQ(PointF(3.5f, 5.5f).ToString(), a.ToString());
 }
 
 }  // namespace gfx