Rename GrBatchFlushState to GrOpFlushState

Change-Id: I1a8052c61d7624929caf45ba44e2a465cd0dc1c2
Reviewed-on: https://skia-review.googlesource.com/5649
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/gn/gpu.gni b/gn/gpu.gni
index e87ea7c..4df4461 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -75,8 +75,6 @@
   "$_src/gpu/GrAllocator.h",
   "$_src/gpu/GrBatchAtlas.cpp",
   "$_src/gpu/GrBatchAtlas.h",
-  "$_src/gpu/GrBatchFlushState.cpp",
-  "$_src/gpu/GrBatchFlushState.h",
   "$_src/gpu/GrBatchTest.cpp",
   "$_src/gpu/GrBatchTest.h",
   "$_src/gpu/GrBitmapTextureMaker.cpp",
@@ -119,6 +117,8 @@
   "$_src/gpu/GrMemoryPool.h",
   "$_src/gpu/GrMesh.h",
   "$_src/gpu/GrNonAtomicRef.h",
+  "$_src/gpu/GrOpFlushState.cpp",
+  "$_src/gpu/GrOpFlushState.h",
   "$_src/gpu/GrOpList.cpp",
   "$_src/gpu/GrOpList.h",
   "$_src/gpu/GrOvalRenderer.cpp",