Use proper namespace in skia/ext

The code was cut and pasted and kept its old namespace.

Remove SkPointToCGPoint and CGPointToSkPoint, which were not used anywhere.

BUG=561010

Review URL: https://codereview.chromium.org/1508893003

Cr-Commit-Position: refs/heads/master@{#364427}

2 files changed, 12 insertions, 12 deletions

diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm
index 05da58b..eb4fc21 100644
--- a/ui/base/clipboard/clipboard_mac.mm
+++ b/ui/base/clipboard/clipboard_mac.mm
@@ -329,7 +329,7 @@ SkBitmap ClipboardMac::ReadImage(ClipboardType type) const {
 
   SkBitmap bitmap;
   if (image.get()) {
-    bitmap = gfx::NSImageToSkBitmapWithColorSpace(
+    bitmap = skia::NSImageToSkBitmapWithColorSpace(
         image.get(), /*is_opaque=*/ false, base::mac::GetSystemColorSpace());
   }
   return bitmap;
@@ -440,7 +440,7 @@ void ClipboardMac::WriteBookmark(const char* title_data,
 }
 
 void ClipboardMac::WriteBitmap(const SkBitmap& bitmap) {
-  NSImage* image = gfx::SkBitmapToNSImageWithColorSpace(
+  NSImage* image = skia::SkBitmapToNSImageWithColorSpace(
       bitmap, base::mac::GetSystemColorSpace());
   // An API to ask the NSImage to write itself to the clipboard comes in 10.6 :(
   // For now, spit out the image as a TIFF.
diff --git a/ui/base/cocoa/controls/blue_label_button.mm b/ui/base/cocoa/controls/blue_label_button.mm
index 319fff8..9d9b580 100644
--- a/ui/base/cocoa/controls/blue_label_button.mm
+++ b/ui/base/cocoa/controls/blue_label_button.mm
@@ -63,7 +63,7 @@ const SkColor kPressOuterRingColor = SkColorSetRGB(0x23, 0x52, 0xa2);
   base::scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
   [shadow setShadowOffset:NSMakeSize(0, -1)];
   [shadow setShadowBlurRadius:0];
-  [shadow setShadowColor:gfx::SkColorToSRGBNSColor(kTextShadowColor)];
+  [shadow setShadowColor:skia::SkColorToSRGBNSColor(kTextShadowColor)];
 
   NSDictionary* buttonTextAttributes = @{
     NSParagraphStyleAttributeName : buttonTextParagraphStyle,
@@ -112,24 +112,24 @@ const SkColor kPressOuterRingColor = SkColorSetRGB(0x23, 0x52, 0xa2);
   frame.size.height -= 1;
 
   if (hoverState == kHoverStateMouseDown && [self isHighlighted]) {
-    centerColor = gfx::SkColorToSRGBNSColor(kPressedColor);
-    innerColor = gfx::SkColorToSRGBNSColor(kPressInnerRingColor);
-    outerColor = gfx::SkColorToSRGBNSColor(kPressOuterRingColor);
+    centerColor = skia::SkColorToSRGBNSColor(kPressedColor);
+    innerColor = skia::SkColorToSRGBNSColor(kPressInnerRingColor);
+    outerColor = skia::SkColorToSRGBNSColor(kPressOuterRingColor);
   } else {
     centerColor = hoverState == kHoverStateMouseOver ?
-        gfx::SkColorToSRGBNSColor(kHoverColor) :
-        gfx::SkColorToSRGBNSColor(kDefaultColor);
+        skia::SkColorToSRGBNSColor(kHoverColor) :
+        skia::SkColorToSRGBNSColor(kDefaultColor);
     innerColor = [self showsFirstResponder] ?
-        gfx::SkColorToSRGBNSColor(kFocusInnerRingColor) :
-        gfx::SkColorToSRGBNSColor(kInnerRingColor);
-    outerColor = gfx::SkColorToSRGBNSColor(kOuterRingColor);
+        skia::SkColorToSRGBNSColor(kFocusInnerRingColor) :
+        skia::SkColorToSRGBNSColor(kInnerRingColor);
+    outerColor = skia::SkColorToSRGBNSColor(kOuterRingColor);
   }
   {
     gfx::ScopedNSGraphicsContextSaveGState context;
     base::scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
     [shadow setShadowOffset:NSMakeSize(0, -1)];
     [shadow setShadowBlurRadius:1.0];
-    [shadow setShadowColor:gfx::SkColorToSRGBNSColor(kShadowColor)];
+    [shadow setShadowColor:skia::SkColorToSRGBNSColor(kShadowColor)];
     [shadow set];
     [outerColor set];