cleanup reentrance logic in CMM

tests/GLProgramsTest.cpp

Index: tests/GLProgramsTest.cpp
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index c9e840e9c140b4853daf391b1389c6387c6c44c6..100752ecd89827b5d7d4e1a0876dc6e740f152e1 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -328,7 +328,7 @@ static void set_random_hints(GrGpuGL* gpu, SkRandom* random) {
 
 static void set_random_state(GrGpuGL* gpu, SkRandom* random) {
     int state = 0;
-    for (int i = 1; i <= GrDrawState::kLastPublicStateBit; i <<= 1) {
+    for (int i = 1; i <= GrDrawState::kLast_StateBit; i <<= 1) {
         state |= random->nextBool() * i;
     }
     gpu->drawState()->enableState(state);