Split CPU and GPU DeferredCanvas tests

tests/DeferredCanvasTest.cpp

Index: tests/DeferredCanvasTest.cpp
diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp
index ffcbc23d5645f3aa512679c99b9e4ee888fcddcf..b61ae2ede2f9ab37493cbe576628aacc341e4908 100644
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -816,7 +816,7 @@ static void TestDeferredCanvasCreateCompatibleDevice(skiatest::Reporter* reporte
     REPORTER_ASSERT(reporter, notificationCounter.fStorageAllocatedChangedCount == 1);
 }
 
-DEF_GPUTEST(DeferredCanvas, reporter, factory) {
+DEF_TEST(DeferredCanvas_CPU, reporter) {
     TestDeferredCanvasBitmapAccess(reporter);
     TestDeferredCanvasFlush(reporter);
     TestDeferredCanvasSilentFlush(reporter);
@@ -830,7 +830,10 @@ DEF_GPUTEST(DeferredCanvas, reporter, factory) {
     TestDeferredCanvasWritePixelsToSurface(reporter);
     TestDeferredCanvasSurface(reporter, NULL);
     TestDeferredCanvasSetSurface(reporter, NULL);
-    if (NULL != factory) {
+}
+
+DEF_GPUTEST(DeferredCanvas_GPU, reporter, factory) {
+    if (factory != NULL) {
         TestDeferredCanvasSurface(reporter, factory);
         TestDeferredCanvasSetSurface(reporter, factory);
     }