Revert of Begin instanced rendering for simple shapes

src/gpu/GrDrawTarget.h

Index: src/gpu/GrDrawTarget.h
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index 2a5bbde1a3a55bff9dbc6461522ec50ec474545b..64c8a3345ce43c7033aa0f1e639641652f95fb56 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -144,11 +144,6 @@
                      const SkIRect& srcRect,
                      const SkIPoint& dstPoint);
 
-    /**
-     * Gets the shape rendering object if it is supported on this platform.
-     */
-    gr_instanced::InstancedRendering* instancedRendering() const { return fInstancedRendering; }
-
 private:
     friend class GrDrawingManager; // for resetFlag & TopoSortTraits
     friend class GrDrawContextPriv; // for clearStencilClip
@@ -214,26 +209,24 @@
     // Used only by drawContextPriv.
     void clearStencilClip(const SkIRect&, bool insideClip, GrRenderTarget*);
 
-    SkSTArray<256, SkAutoTUnref<GrBatch>, true>     fBatches;
+    SkSTArray<256, SkAutoTUnref<GrBatch>, true> fBatches;
     // The context is only in service of the clip mask manager, remove once CMM doesn't need this.
-    GrContext*                                      fContext;
-    GrGpu*                                          fGpu;
-    GrResourceProvider*                             fResourceProvider;
-    GrAuditTrail*                                   fAuditTrail;
-
-    SkDEBUGCODE(int                                 fDebugID;)
-    uint32_t                                        fFlags;
+    GrContext*                                  fContext;
+    GrGpu*                                      fGpu;
+    GrResourceProvider*                         fResourceProvider;
+    GrAuditTrail*                               fAuditTrail;
+
+    SkDEBUGCODE(int                             fDebugID;)
+    uint32_t                                    fFlags;
 
     // 'this' drawTarget relies on the output of the drawTargets in 'fDependencies'
-    SkTDArray<GrDrawTarget*>                        fDependencies;
-    GrRenderTarget*                                 fRenderTarget;
-
-    bool                                            fClipBatchToBounds;
-    bool                                            fDrawBatchBounds;
-    int                                             fMaxBatchLookback;
-    int                                             fMaxBatchLookahead;
-
-    SkAutoTDelete<gr_instanced::InstancedRendering> fInstancedRendering;
+    SkTDArray<GrDrawTarget*>                    fDependencies;
+    GrRenderTarget*                             fRenderTarget;
+
+    bool                                        fClipBatchToBounds;
+    bool                                        fDrawBatchBounds;
+    int                                         fMaxBatchLookback;
+    int                                         fMaxBatchLookahead;
 
     typedef SkRefCnt INHERITED;
 };