Revert of Refactor how we store and use samplers in Ganesh

src/gpu/gl/GrGLUniformHandler.h

Index: src/gpu/gl/GrGLUniformHandler.h
diff --git a/src/gpu/gl/GrGLUniformHandler.h b/src/gpu/gl/GrGLUniformHandler.h
index 3656d3a10810db2215d56036a5534e196cd58ae8..1dac8d959e7a0a60b36241af570e03d79962dabe 100644
--- a/src/gpu/gl/GrGLUniformHandler.h
+++ b/src/gpu/gl/GrGLUniformHandler.h
@@ -11,7 +11,6 @@
 #include "glsl/GrGLSLUniformHandler.h"
 
 #include "gl/GrGLProgramDataManager.h"
-#include "gl/GrGLSampler.h"
 
 class GrGLCaps;
 
@@ -39,17 +38,6 @@
                                           int arrayCount,
                                           const char** outName) override;
 
-    SamplerHandle internalAddSampler(uint32_t visibility,
-                                     GrPixelConfig config,
-                                     GrSLType type,
-                                     GrSLPrecision precision,
-                                     const char* name) override;
-
-    int numSamplers() const override { return fSamplers.count(); }
-    const GrGLSLSampler& getSampler(SamplerHandle handle) const override {
-        return fSamplers[handle.toIndex()];
-    }
-
     void appendUniformDecls(GrShaderFlags visibility, SkString*) const override;
 
     // Manually set uniform locations for all our uniforms.
@@ -65,8 +53,6 @@
 
     UniformInfoArray fUniforms;
 
-    SkTArray<GrGLSampler> fSamplers;
-
     friend class GrGLProgramBuilder;
 
     typedef GrGLSLUniformHandler INHERITED;