Retract GrRenderTarget from GrTestTarget

tools/gpu/GrTest.h

Index: tools/gpu/GrTest.h
diff --git a/tools/gpu/GrTest.h b/tools/gpu/GrTest.h
index 53aaac34e48afc5920d7f16d3a72e9cce182eb78..217efe6b7d818fcf0b52f63fe5f25b0fe0a89683 100644
--- a/tools/gpu/GrTest.h
+++ b/tools/gpu/GrTest.h
@@ -9,8 +9,7 @@
 #define GrTest_DEFINED
 
 #include "GrContext.h"
-#include "GrDrawTarget.h"
-#include "gl/GrGLContext.h"
+#include "GrDrawContext.h"
 
 namespace GrTest {
     /**
@@ -28,15 +27,14 @@ class GrTestTarget {
 public:
     GrTestTarget() {};
 
-    void init(GrContext*, GrDrawTarget*, GrRenderTarget*);
+    void init(GrContext*, sk_sp<GrDrawContext>);
 
-    GrDrawTarget* target() { return fDrawTarget.get(); }
+    GrDrawTarget* target() { return fDrawContext->getDrawTarget(); }
     GrResourceProvider* resourceProvider() { return fContext->resourceProvider(); }
 
 private:
     SkAutoTUnref<GrContext>                 fContext;
-    SkAutoTUnref<GrDrawTarget>              fDrawTarget;
-    SkAutoTUnref<GrRenderTarget>            fRenderTarget;
+    sk_sp<GrDrawContext>                    fDrawContext;
 };
 
 #endif