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

src/gpu/batches/GrDrawBatch.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 GrDrawBatch_DEFINED
 #define GrDrawBatch_DEFINED
 
@@ skipping 58 matching lines @@
         return reinterpret_cast<const GrPipeline*>(fPipelineStorage.get());
     }
 
     bool installPipeline(const GrPipeline::CreateArgs&);
 
     // TODO no GrPrimitiveProcessors yet read fragment position
     bool willReadFragmentPosition() const { return false; }
 
     uint32_t renderTargetUniqueID() const final {
         SkASSERT(fPipelineInstalled);
-        return this->pipeline()->getRenderTarget()->getUniqueID();
+        return this->pipeline()->getRenderTarget()->uniqueID();
     }
 
     GrRenderTarget* renderTarget() const final {
         SkASSERT(fPipelineInstalled);
         return this->pipeline()->getRenderTarget();
     }
 
     SkString dumpInfo() const override {
         SkString string;
         string.appendf("RT: %d\n", this->renderTargetUniqueID());
@@ skipping 49 matching lines @@
     };
     SkTArray<QueuedUpload>   fInlineUploads;
 
 private:
     SkAlignedSTStorage<1, GrPipeline>               fPipelineStorage;
     bool                                            fPipelineInstalled;
     typedef GrBatch INHERITED;
 };
 
 #endif