cc: Clean up naming of paint-related identifiers

cc/trees/layer_tree_host_unittest_context.cc

 // Copyright 2012 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 <stddef.h>
 #include <stdint.h>
 
 #include "base/memory/ptr_util.h"
 #include "cc/layers/heads_up_display_layer.h"
 #include "cc/layers/layer_impl.h"
@@ skipping 592 matching lines @@
 // This test uses PictureLayer to check for a working context.
 class LayerTreeHostContextTestLostContextSucceedsWithContent
     : public LayerTreeHostContextTestLostContextSucceeds {
  public:
   void SetupTree() override {
     root_ = Layer::Create();
     root_->SetBounds(gfx::Size(10, 10));
     root_->SetIsDrawable(true);
 
     // Paint non-solid color.
-    PaintFlags paint;
-    paint.setColor(SkColorSetARGB(100, 80, 200, 200));
-    client_.add_draw_rect(gfx::Rect(5, 5), paint);
+    PaintFlags flags;
+    flags.setColor(SkColorSetARGB(100, 80, 200, 200));
+    client_.add_draw_rect(gfx::Rect(5, 5), flags);
 
     layer_ = FakePictureLayer::Create(&client_);
     layer_->SetBounds(gfx::Size(10, 10));
     layer_->SetIsDrawable(true);
 
     root_->AddChild(layer_);
 
     layer_tree_host()->SetRootLayer(root_);
     LayerTreeHostContextTest::SetupTree();
     client_.set_bounds(root_->bounds());
@@ skipping 56 matching lines @@
     : public LayerTreeHostContextTest {
  public:
   LayerTreeHostContextTestLostContextAndEvictTextures()
       : LayerTreeHostContextTest(),
         impl_host_(0),
         num_commits_(0),
         lost_context_(false) {}
 
   void SetupTree() override {
     // Paint non-solid color.
-    PaintFlags paint;
-    paint.setColor(SkColorSetARGB(100, 80, 200, 200));
-    client_.add_draw_rect(gfx::Rect(5, 5), paint);
+    PaintFlags flags;
+    flags.setColor(SkColorSetARGB(100, 80, 200, 200));
+    client_.add_draw_rect(gfx::Rect(5, 5), flags);
 
     scoped_refptr<FakePictureLayer> picture_layer =
         FakePictureLayer::Create(&client_);
     picture_layer->SetBounds(gfx::Size(10, 20));
     client_.set_bounds(picture_layer->bounds());
     layer_tree_host()->SetRootLayer(picture_layer);
 
     LayerTreeHostContextTest::SetupTree();
   }
 
@@ skipping 891 matching lines @@
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostContextTestLoseAfterSendingBeginMainFrame);
 
 // This test causes context loss on the worker context but not the compositor
 // context and checks that draw still occurs. The resources might be in a bad
 // state e.g. null sync tokens but that shouldn't cause the draw to fail.
 class LayerTreeHostContextTestLoseWorkerContextDuringPrepareTiles
     : public LayerTreeTest {
  protected:
   void SetupTree() override {
-    PaintFlags paint;
+    PaintFlags flags;
     client_.set_fill_with_nonsolid_color(true);
-    client_.add_draw_rect(gfx::Rect(5, 5), paint);
+    client_.add_draw_rect(gfx::Rect(5, 5), flags);
 
     scoped_refptr<FakePictureLayer> picture_layer =
         FakePictureLayer::Create(&client_);
     picture_layer->SetBounds(gfx::Size(10, 20));
     client_.set_bounds(picture_layer->bounds());
     layer_tree_host()->SetRootLayer(picture_layer);
 
     LayerTreeTest::SetupTree();
   }
 
@@ skipping 17 matching lines @@
 
   FakeContentLayerClient client_;
   int num_draws_ = 0;
 };
 
 MULTI_THREAD_TEST_F(
     LayerTreeHostContextTestLoseWorkerContextDuringPrepareTiles);
 
 }  // namespace
 }  // namespace cc