cc: Clean up naming of paint-related identifiers

cc/test/solid_color_content_layer_client.cc

Index: cc/test/solid_color_content_layer_client.cc
diff --git a/cc/test/solid_color_content_layer_client.cc b/cc/test/solid_color_content_layer_client.cc
index 16330cc90a75e3ad6742c98ef09835b687600f24..cb8e13c27995cf8e1ced5936ad5d60c39e60690f 100644
--- a/cc/test/solid_color_content_layer_client.cc
+++ b/cc/test/solid_color_content_layer_client.cc
@@ -30,22 +30,22 @@ SolidColorContentLayerClient::PaintContentsToDisplayList(
   canvas->clear(SK_ColorTRANSPARENT);
 
   if (border_size_ != 0) {
-    PaintFlags paint;
-    paint.setStyle(PaintFlags::kFill_Style);
-    paint.setColor(border_color_);
+    PaintFlags flags;
+    flags.setStyle(PaintFlags::kFill_Style);
+    flags.setColor(border_color_);
     canvas->drawRect(
         SkRect::MakeXYWH(clip.x(), clip.y(), clip.width(), clip.height()),
-        paint);
+        flags);
   }
 
-  PaintFlags paint;
-  paint.setStyle(PaintFlags::kFill_Style);
-  paint.setColor(color_);
+  PaintFlags flags;
+  flags.setStyle(PaintFlags::kFill_Style);
+  flags.setColor(color_);
   canvas->drawRect(
       SkRect::MakeXYWH(clip.x() + border_size_, clip.y() + border_size_,
                        clip.width() - 2 * border_size_,
                        clip.height() - 2 * border_size_),
-      paint);
+      flags);
 
   auto display_list = make_scoped_refptr(new DisplayItemList);
   display_list->CreateAndAppendDrawingItem<DrawingDisplayItem>(