I'd really like to land this before the branch so speedy reviews are appreciated.

BUG=skia:

Review URL: https://codereview.chromium.org/936943002
diff --git a/tests/ClipCacheTest.cpp b/tests/ClipCacheTest.cpp
index 0e5fe1e..3d3fa95 100644
--- a/tests/ClipCacheTest.cpp
+++ b/tests/ClipCacheTest.cpp
@@ -84,17 +84,17 @@
     REPORTER_ASSERT(reporter, screen == devStackBounds);
     REPORTER_ASSERT(reporter, isIntersectionOfRects);
 
-    // wrap the SkClipStack in a GrClipData
+    // wrap the SkClipStack in a GrClip
     GrClip clipData;
     clipData.setClipStack(&stack);
 
-    SkIRect devGrClipDataBound;
+    SkIRect devGrClipBound;
     clipData.getConservativeBounds(texture,
-                                   &devGrClipDataBound,
+                                   &devGrClipBound,
                                    &isIntersectionOfRects);
 
-    // make sure that GrClipData is behaving itself
-    REPORTER_ASSERT(reporter, intScreen == devGrClipDataBound);
+    // make sure that GrClip is behaving itself
+    REPORTER_ASSERT(reporter, intScreen == devGrClipBound);
     REPORTER_ASSERT(reporter, isIntersectionOfRects);
 }