Revert 50784 - Canvas refactoring part 3....

gfx/font_mac.mm

Index: gfx/font_mac.mm
===================================================================
--- gfx/font_mac.mm	(revision 50789)
+++ gfx/font_mac.mm	(working copy)
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 
 namespace gfx {
 
@@ -60,8 +60,7 @@
 
 int Font::GetStringWidth(const std::wstring& text) const {
   int width = 0, height = 0;
-  CanvasSkia::SizeStringInt(text, *this, &width, &height,
-                            gfx::Canvas::NO_ELLIPSIS);
+  Canvas::SizeStringInt(text, *this, &width, &height, gfx::Canvas::NO_ELLIPSIS);
   return width;
 }