Have GrSurfaceProxys and GrGpuResources draw from the same pool of unique ids

src/gpu/batches/GrStencilPathBatch.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrStencilPathBatch_DEFINED
 #define GrStencilPathBatch_DEFINED
 
@@ skipping 15 matching lines @@
                            int numStencilBits,
                            const GrScissorState& scissor,
                            GrRenderTarget* renderTarget,
                            const GrPath* path) {
         return new GrStencilPathBatch(viewMatrix, useHWAA, fillType, hasStencilClip,
                                       numStencilBits, scissor, renderTarget, path);
     }
 
     const char* name() const override { return "StencilPath"; }
 
-    uint32_t renderTargetUniqueID() const override { return fRenderTarget.get()->getUniqueID(); }
+    uint32_t renderTargetUniqueID() const override { return fRenderTarget.get()->uniqueID(); }
     GrRenderTarget* renderTarget() const override { return fRenderTarget.get(); }
 
     SkString dumpInfo() const override {
         SkString string;
         string.printf("PATH: 0x%p, AA:%d", fPath.get(), fUseHWAA);
         string.append(INHERITED::dumpInfo());
         return string;
     }
 
 private:
@@ skipping 29 matching lines @@
     bool                                                    fUseHWAA;
     GrStencilSettings                                       fStencil;
     GrScissorState                                          fScissor;
     GrPendingIOResource<GrRenderTarget, kWrite_GrIOType>    fRenderTarget;
     GrPendingIOResource<const GrPath, kRead_GrIOType>       fPath;
 
     typedef GrBatch INHERITED;
 };
 
 #endif