Eliminate special case nvpr batch handling

src/gpu/batches/GrStencilPathBatch.h

Index: src/gpu/batches/GrStencilPathBatch.h
diff --git a/src/gpu/batches/GrStencilPathBatch.h b/src/gpu/batches/GrStencilPathBatch.h
index 84778225a58406eb312f524cd2e010da7064b23e..05b55efafa37142f3927522bf132d9732d4e7601 100644
--- a/src/gpu/batches/GrStencilPathBatch.h
+++ b/src/gpu/batches/GrStencilPathBatch.h
@@ -21,13 +21,13 @@ public:
 
     static GrBatch* Create(const SkMatrix& viewMatrix,
                            bool useHWAA,
-                           const GrUserStencilSettings& userStencil,
+                           GrPathRendering::FillType fillType,
                            bool hasStencilClip,
                            int numStencilBits,
                            const GrScissorState& scissor,
                            GrRenderTarget* renderTarget,
                            const GrPath* path) {
-        return new GrStencilPathBatch(viewMatrix, useHWAA, userStencil, hasStencilClip,
+        return new GrStencilPathBatch(viewMatrix, useHWAA, fillType, hasStencilClip,
                                       numStencilBits, scissor, renderTarget, path);
     }
 
@@ -45,7 +45,7 @@ public:
 private:
     GrStencilPathBatch(const SkMatrix& viewMatrix,
                        bool useHWAA,
-                       const GrUserStencilSettings& userStencil,
+                       GrPathRendering::FillType fillType,
                        bool hasStencilClip,
                        int numStencilBits,
                        const GrScissorState& scissor,
@@ -54,7 +54,7 @@ private:
     : INHERITED(ClassID())
     , fViewMatrix(viewMatrix)
     , fUseHWAA(useHWAA)
-    , fStencil(userStencil, hasStencilClip, numStencilBits)
+    , fStencil(GrPathRendering::GetStencilPassSettings(fillType), hasStencilClip, numStencilBits)
     , fScissor(scissor)
     , fRenderTarget(renderTarget)
     , fPath(path) {