cc: Clean up naming of paint-related identifiers

cc/playback/recording_source_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "cc/base/region.h"
 #include "cc/playback/raster_source.h"
 #include "cc/test/fake_content_layer_client.h"
@@ skipping 174 matching lines @@
 
   SkPaint simple_paint;
   simple_paint.setColor(SkColorSetARGB(255, 12, 23, 34));
 
   SkBitmap non_discardable_bitmap;
   non_discardable_bitmap.allocN32Pixels(128, 128);
   non_discardable_bitmap.setImmutable();
   sk_sp<SkImage> non_discardable_image =
       SkImage::MakeFromBitmap(non_discardable_bitmap);
 
-  recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 256, 256),
+  recording_source->add_draw_rect_with_flags(gfx::Rect(0, 0, 256, 256),
                                              simple_paint);
-  recording_source->add_draw_rect_with_paint(gfx::Rect(128, 128, 512, 512),
+  recording_source->add_draw_rect_with_flags(gfx::Rect(128, 128, 512, 512),
                                              simple_paint);
-  recording_source->add_draw_rect_with_paint(gfx::Rect(512, 0, 256, 256),
+  recording_source->add_draw_rect_with_flags(gfx::Rect(512, 0, 256, 256),
                                              simple_paint);
-  recording_source->add_draw_rect_with_paint(gfx::Rect(0, 512, 256, 256),
+  recording_source->add_draw_rect_with_flags(gfx::Rect(0, 512, 256, 256),
                                              simple_paint);
   recording_source->add_draw_image(non_discardable_image, gfx::Point(128, 0));
   recording_source->add_draw_image(non_discardable_image, gfx::Point(0, 128));
   recording_source->add_draw_image(non_discardable_image, gfx::Point(150, 150));
   recording_source->SetGenerateDiscardableImagesMetadata(true);
   recording_source->Rerecord();
 
   scoped_refptr<RasterSource> raster_source =
       CreateRasterSource(recording_source.get());
 
@@ skipping 150 matching lines @@
                                               &images);
     EXPECT_EQ(3u, images.size());
     EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
     EXPECT_TRUE(images[1].image() == discardable_image[0][1]);
     EXPECT_TRUE(images[2].image() == discardable_image[1][1]);
   }
 }
 
 }  // namespace
 }  // namespace cc