SkRect to gfx::Rect type conversions.

ui/gfx/rect_unittest.cc

 // Copyright (c) 2011 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/rect.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 
@@ skipping 377 matching lines @@
   gfx::Rect just_below_no_edge(2, 8, 3, 2);  // too narrow
   gfx::Rect just_left_no_edge(0, 3, 2, 6);   // too tall
   gfx::Rect just_right_no_edge(6, 3, 2, 4);  // too short
 
   EXPECT_FALSE(r.SharesEdgeWith(just_above_no_edge));
   EXPECT_FALSE(r.SharesEdgeWith(just_below_no_edge));
   EXPECT_FALSE(r.SharesEdgeWith(just_left_no_edge));
   EXPECT_FALSE(r.SharesEdgeWith(just_right_no_edge));
 }
 
-TEST(RectTest, SkRectToRect) {
+TEST(RectTest, SkIRectToRect) {
   gfx::Rect src(10, 20, 30, 40);
-  SkRect skrect = gfx::RectToSkRect(src);
-  EXPECT_EQ(src, gfx::SkRectToRect(skrect));
+  SkIRect skrect = gfx::RectToSkIRect(src);
+  EXPECT_EQ(src, gfx::SkIRectToRect(skrect));
 }
 
 // Similar to EXPECT_FLOAT_EQ, but lets NaN equal NaN
 #define EXPECT_FLOAT_AND_NAN_EQ(a, b) \
   { if (a == a || b == b) { EXPECT_FLOAT_EQ(a, b); } }
 
 TEST(RectTest, ScaleRect) {
   static const struct Test {
     int x1;  // source
     int y1;
@@ skipping 188 matching lines @@
   gfx::RectF b(10, 20, 30, 40);
 
   gfx::RectF intersect = gfx::IntersectRects(a, b);
   EXPECT_EQ(b.ToString(), intersect.ToString());
 
   EXPECT_EQ(a, b);
   EXPECT_EQ(b, a);
 }
 
 }  // namespace ui