Removal of dependencies on PlatformDevice classes.

ui/gfx/canvas_skia_mac.mm

 // Copyright (c) 2010 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "ui/gfx/canvas_skia.h"
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
@@ skipping 30 matching lines @@
 }
 
 void CanvasSkia::DrawStringInt(const string16& text,
                                const gfx::Font& font,
                                const SkColor& color,
                                int x, int y, int w, int h,
                                int flags) {
   if (!IntersectsClipRectInt(x, y, w, h))
     return;
 
-  CGContextRef context = beginPlatformPaint();
+  skia::ScopedPlatformPaint scoped_platform_paint(this):
+  CGContextRef context = scoped_platform_paint.GetPlatformSurface();
   CGContextSaveGState(context);
 
   NSColor* ns_color = [NSColor colorWithDeviceRed:SkColorGetR(color) / 255.0
                                             green:SkColorGetG(color) / 255.0
                                              blue:SkColorGetB(color) / 255.0
                                             alpha:SkColorGetA(color) / 255.0];
   NSMutableParagraphStyle *ns_style =
       [[[NSParagraphStyle alloc] init] autorelease];
   if (flags & TEXT_ALIGN_CENTER)
     [ns_style setAlignment:NSCenterTextAlignment];
@@ skipping 14 matching lines @@
           base::mac::NSToCFCast(ns_string)));
 
   CGRect text_bounds = CGRectMake(x, y, w, h);
   CGMutablePathRef path = CGPathCreateMutable();
   CGPathAddRect(path, NULL, text_bounds);
 
   base::mac::ScopedCFTypeRef<CTFrameRef> frame(
       CTFramesetterCreateFrame(framesetter, CFRangeMake(0, 0), path, NULL));
   CTFrameDraw(frame, context);
   CGContextRestoreGState(context);
-  endPlatformPaint();
 }
 
 ui::TextureID CanvasSkia::GetTextureID() {
   // TODO(wjmaclean)
   return 0;
 }
 
 }  // namespace gfx