Revert of Add Gr*Proxy classes

gyp/gpu.gypi

Index: gyp/gpu.gypi
diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index 5919e24b591c16f9b1b087f31cc358a89bc89d6c..69f286d239d3419a563fb682b6349c2005429f23 100644
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -61,9 +61,6 @@
       # Private includes
       '<(skia_include_path)/private/GrAuditTrail.h',
       '<(skia_include_path)/private/GrSingleOwner.h',
-      '<(skia_include_path)/private/GrRenderTargetProxy.h',
-      '<(skia_include_path)/private/GrSurfaceProxy.h',
-      '<(skia_include_path)/private/GrTextureProxy.h',
 
       '<(skia_src_path)/gpu/GrAuditTrail.cpp',
       '<(skia_src_path)/gpu/GrAutoLocaleSetter.h',
@@ -160,7 +157,6 @@
       '<(skia_src_path)/gpu/GrRectanizer_skyline.h',
       '<(skia_src_path)/gpu/GrRenderTarget.cpp',
       '<(skia_src_path)/gpu/GrRenderTargetPriv.h',
-      '<(skia_src_path)/gpu/GrRenderTargetProxy.cpp',
       '<(skia_src_path)/gpu/GrReducedClip.cpp',
       '<(skia_src_path)/gpu/GrReducedClip.h',
       '<(skia_src_path)/gpu/GrResourceCache.cpp',
@@ -189,14 +185,12 @@
       '<(skia_src_path)/gpu/GrSoftwarePathRenderer.h',
       '<(skia_src_path)/gpu/GrSurfacePriv.h',
       '<(skia_src_path)/gpu/GrSurface.cpp',
-      '<(skia_src_path)/gpu/GrSurfaceProxy.cpp',
       '<(skia_src_path)/gpu/GrSwizzle.h',
       '<(skia_src_path)/gpu/GrTexture.cpp',
       '<(skia_src_path)/gpu/GrTextureParamsAdjuster.h',
       '<(skia_src_path)/gpu/GrTextureParamsAdjuster.cpp',
+      '<(skia_src_path)/gpu/GrTextureProvider.cpp',
       '<(skia_src_path)/gpu/GrTexturePriv.h',
-      '<(skia_src_path)/gpu/GrTextureProvider.cpp',
-      '<(skia_src_path)/gpu/GrTextureProxy.cpp',
       '<(skia_src_path)/gpu/GrTextureToYUVPlanes.cpp',
       '<(skia_src_path)/gpu/GrTextureToYUVPlanes.h',
       '<(skia_src_path)/gpu/GrTextureAccess.cpp',