Revert of Split CPU and GPU DeferredCanvas tests

tests/DeferredCanvasTest.cpp

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