Revert of Refactor drawContext/RenderTarget creation

tests/ClipBoundsTest.cpp

Index: tests/ClipBoundsTest.cpp
diff --git a/tests/ClipBoundsTest.cpp b/tests/ClipBoundsTest.cpp
index 5660afdc27aa2cdb00b422509230113d3cbb1792..abdd3f44fa1e4e3b1d36fda9bdf2aa5fd6c28779 100644
--- a/tests/ClipBoundsTest.cpp
+++ b/tests/ClipBoundsTest.cpp
@@ -17,8 +17,20 @@
     static const int kXSize = 100;
     static const int kYSize = 100;
 
-    const SkIRect intScreen = SkIRect::MakeWH(kXSize, kYSize);
-    const SkRect screen = SkRect::Make(intScreen);
+    GrSurfaceDesc desc;
+    desc.fFlags     = kRenderTarget_GrSurfaceFlag;
+    desc.fConfig    = kAlpha_8_GrPixelConfig;
+    desc.fWidth     = kXSize;
+    desc.fHeight    = kYSize;
+
+    SkAutoTUnref<GrTexture> texture(
+        ctxInfo.fGrContext->textureProvider()->createTexture(desc, SkBudgeted::kYes, nullptr, 0));
+    if (!texture) {
+        return;
+    }
+
+    SkIRect intScreen = SkIRect::MakeWH(kXSize, kYSize);
+    SkRect screen = SkRect::Make(intScreen);
 
     SkRect clipRect(screen);
     clipRect.outset(10, 10);
@@ -44,7 +56,7 @@
     clipData.setClipStack(&stack);
 
     SkIRect devGrClipBound;
-    clipData.getConservativeBounds(kXSize, kYSize,
+    clipData.getConservativeBounds(texture->width(), texture->height(),
                                    &devGrClipBound,
                                    &isIntersectionOfRects);