4 files changed, 3 insertions, 80 deletions
diff --git a/gm/cgms.cpp b/gm/cgms.cpp
index e3e84b03e1..832a7b50fd 100644
--- a/gm/cgms.cpp
+++ b/gm/cgms.cpp
@@ -10,26 +10,6 @@
 
 extern "C" void sk_test_c_api(sk_canvas_t*);
 
-class C_GM : public skiagm::GM {
-public:
-    C_GM() {}
-
-protected:
-    SkString onShortName() override {
-        return SkString("c_gms");
-    }
-
-    SkISize onISize() override {
-        return SkISize::Make(640, 480);
-    }
-
-    void onDraw(SkCanvas* canvas) override {
-        sk_test_c_api((sk_canvas_t*)canvas);
-    }
-
-private:
-    typedef GM INHERITED;
-};
-
-DEF_GM( return new C_GM; )
-
+DEF_SIMPLE_GM(c_gms, canvas, 640, 480) {
+    sk_test_c_api((sk_canvas_t*)canvas);
+}
diff --git a/include/c/sk_surface.h b/include/c/sk_surface.h
index 76fc5b6a66..397dc833c2 100644
--- a/include/c/sk_surface.h
+++ b/include/c/sk_surface.h
@@ -31,11 +31,6 @@ sk_canvas_t* sk_surface_get_canvas(sk_surface_t*);
  */
 sk_image_t* sk_surface_new_image_snapshot(sk_surface_t*);
 
-#ifdef __cplusplus
-    class SkCanvas;
-    void sk_test_capi(SkCanvas*);
-#endif
-
 SK_C_PLUS_PLUS_END_GUARD
 
 #endif
diff --git a/include/c/sk_types.h b/include/c/sk_types.h
index f517434764..87cc0555bd 100644
--- a/include/c/sk_types.h
+++ b/include/c/sk_types.h
@@ -142,11 +142,6 @@ typedef enum {
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-#ifdef __cplusplus
-    class SkCanvas;
-    void sk_test_capi(SkCanvas*);
-#endif
-
 SK_C_PLUS_PLUS_END_GUARD
 
 #endif
diff --git a/src/c/sk_surface.cpp b/src/c/sk_surface.cpp
index 5b6210d19d..1e676ffe7c 100644
--- a/src/c/sk_surface.cpp
+++ b/src/c/sk_surface.cpp
@@ -625,50 +625,3 @@ const void* sk_data_get_data(const sk_data_t* cdata) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////
-
-void sk_test_capi(SkCanvas* canvas) {
-    sk_imageinfo_t cinfo;
-    cinfo.width = 100;
-    cinfo.height = 100;
-    cinfo.colorType = (sk_colortype_t)kN32_SkColorType;
-    cinfo.alphaType = (sk_alphatype_t)kPremul_SkAlphaType;
-    
-    sk_surfaceprops_t surfaceprops;
-    surfaceprops.pixelGeometry = UNKNOWN_SK_PIXELGEOMETRY;
-
-    sk_surface_t* csurface = sk_surface_new_raster(&cinfo, &surfaceprops);
-    sk_canvas_t* ccanvas = sk_surface_get_canvas(csurface);
-    
-    sk_paint_t* cpaint = sk_paint_new();
-    sk_paint_set_antialias(cpaint, true);
-    sk_paint_set_color(cpaint, 0xFFFF0000);
-    
-    sk_rect_t cr = { 5, 5, 95, 95 };
-    sk_canvas_draw_oval(ccanvas, &cr, cpaint);
-    
-    cr.left += 25;
-    cr.top += 25;
-    cr.right -= 25;
-    cr.bottom -= 25;
-    sk_paint_set_color(cpaint, 0xFF00FF00);
-    sk_canvas_draw_rect(ccanvas, &cr, cpaint);
-    
-    sk_path_t* cpath = sk_path_new();
-    sk_path_move_to(cpath, 50, 50);
-    sk_path_line_to(cpath, 100, 100);
-    sk_path_line_to(cpath, 50, 100);
-    sk_path_close(cpath);
-
-    sk_canvas_draw_path(ccanvas, cpath, cpaint);
-
-    sk_image_t* cimage = sk_surface_new_image_snapshot(csurface);
-    
-    // HERE WE CROSS THE C..C++ boundary
-    canvas->drawImage((const SkImage*)cimage, 20, 20, NULL);
-    
-    sk_path_delete(cpath);
-    sk_paint_delete(cpaint);
-    sk_image_unref(cimage);
-    sk_surface_unref(csurface);
-}