3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/cocoa/base_view.h b/chrome/browser/cocoa/base_view.h
index 552af75..c3d49fd 100644
--- a/chrome/browser/cocoa/base_view.h
+++ b/chrome/browser/cocoa/base_view.h
@@ -30,8 +30,8 @@
 - (void)keyEvent:(NSEvent *)theEvent;
 
 // Useful rect conversions (doing coordinate flipping)
-- (gfx::Rect)NSRectToRect:(NSRect)rect;
-- (NSRect)RectToNSRect:(gfx::Rect)rect;
+- (gfx::Rect)flipNSRectToRect:(NSRect)rect;
+- (NSRect)flipRectToNSRect:(gfx::Rect)rect;
 
 @end
 
diff --git a/chrome/browser/cocoa/base_view.mm b/chrome/browser/cocoa/base_view.mm
index cee8951..4c9f999 100644
--- a/chrome/browser/cocoa/base_view.mm
+++ b/chrome/browser/cocoa/base_view.mm
@@ -127,13 +127,13 @@
   [self keyEvent:theEvent];
 }
 
-- (gfx::Rect)NSRectToRect:(NSRect)rect {
+- (gfx::Rect)flipNSRectToRect:(NSRect)rect {
   gfx::Rect new_rect(NSRectToCGRect(rect));
   new_rect.set_y([self bounds].size.height - new_rect.y() - new_rect.height());
   return new_rect;
 }
 
-- (NSRect)RectToNSRect:(gfx::Rect)rect {
+- (NSRect)flipRectToNSRect:(gfx::Rect)rect {
   NSRect new_rect(NSRectFromCGRect(rect.ToCGRect()));
   new_rect.origin.y =
       [self bounds].size.height - new_rect.origin.y - new_rect.size.height;
diff --git a/chrome/browser/cocoa/base_view_unittest.mm b/chrome/browser/cocoa/base_view_unittest.mm
index bbfc75e..ff97571 100644
--- a/chrome/browser/cocoa/base_view_unittest.mm
+++ b/chrome/browser/cocoa/base_view_unittest.mm
@@ -29,16 +29,16 @@ TEST_VIEW(BaseViewTest, view_)
 // Convert a rect in |view_|'s Cocoa coordinate system to gfx::Rect's top-left
 // coordinate system. Repeat the process in reverse and make sure we come out
 // with the original rect.
-TEST_F(BaseViewTest, NSRectToRect) {
+TEST_F(BaseViewTest, flipNSRectToRect) {
   NSRect convert = NSMakeRect(10, 10, 50, 50);
-  gfx::Rect converted = [view_ NSRectToRect:convert];
+  gfx::Rect converted = [view_ flipNSRectToRect:convert];
   EXPECT_EQ(converted.x(), 10);
   EXPECT_EQ(converted.y(), 40);  // Due to view being 100px tall.
   EXPECT_EQ(converted.width(), convert.size.width);
   EXPECT_EQ(converted.height(), convert.size.height);
 
   // Go back the other way.
-  NSRect back_again = [view_ RectToNSRect:converted];
+  NSRect back_again = [view_ flipRectToNSRect:converted];
   EXPECT_EQ(back_again.origin.x, convert.origin.x);
   EXPECT_EQ(back_again.origin.y, convert.origin.y);
   EXPECT_EQ(back_again.size.width, convert.size.width);