Turn SkCanvasStateUtils into a class with static functions.

include/core/SkCanvas.h

Index: include/core/SkCanvas.h
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 5998ee5a30280264f792b26caa5a670f81d166f2..4df523edefe31c00e1d4fde07fba2dfe9472ee9c 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -41,10 +41,6 @@ class GrRenderTarget;
 
 class SkCanvasState;
 
-namespace SkCanvasStateUtils {
-    SK_API SkCanvasState* CaptureCanvasState(SkCanvas*);
-}
-
 /** \class SkCanvas
 
     A Canvas encapsulates all of the state about drawing into a device (bitmap).
@@ -1347,7 +1343,7 @@ private:
     SkCanvas(const SkBitmap&, const SkSurfaceProps&);
 
     // needs gettotalclip()
-    friend SkCanvasState* SkCanvasStateUtils::CaptureCanvasState(SkCanvas*);
+    friend class SkCanvasStateUtils;
 
     SkBaseDevice* createLayerDevice(const SkImageInfo&);