ui: Clean up naming of paint-related identifiers

ui/gfx/render_text_unittest.cc

 // Copyright (c) 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 "ui/gfx/render_text.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 44 matching lines @@
 using base::WideToUTF16;
 using base::WideToUTF8;
 
 namespace gfx {
 namespace test {
 
 class RenderTextTestApi {
  public:
   RenderTextTestApi(RenderText* render_text) : render_text_(render_text) {}
 
-  static SkPaint& GetRendererPaint(internal::SkiaTextRenderer* renderer) {
-    return renderer->paint_;
+  static cc::PaintFlags& GetRendererPaint(
+      internal::SkiaTextRenderer* renderer) {
+    return renderer->flags_;
   }
 
   // Callers should ensure that the associated RenderText object is a
   // RenderTextHarfBuzz instance.
   internal::TextRunList* GetHarfBuzzRunList() {
     RenderTextHarfBuzz* render_text =
         static_cast<RenderTextHarfBuzz*>(render_text_);
     return render_text->GetRunList();
   }
 
@@ skipping 359 matching lines @@
 #if defined(OS_MACOSX)
         return base::MakeUnique<RenderTextMac>();
 #else
         break;
 #endif
     }
     NOTREACHED();
     return nullptr;
   }
 
-  SkPaint& GetRendererPaint() {
+  cc::PaintFlags& GetRendererPaint() {
     return test::RenderTextTestApi::GetRendererPaint(renderer());
   }
 
   void DrawVisualText() { test_api_->DrawVisualText(renderer()); }
 
   internal::TextRunList* GetHarfBuzzRunList() {
     DCHECK_EQ(RENDER_TEXT_HARFBUZZ, GetParam());
     return test_api_->GetHarfBuzzRunList();
   }
 
@@ skipping 3986 matching lines @@
                         ::testing::Values(RENDER_TEXT_HARFBUZZ),
                         PrintRenderTextBackend());
 #endif
 
 INSTANTIATE_TEST_CASE_P(,
                         RenderTextHarfBuzzTest,
                         ::testing::Values(RENDER_TEXT_HARFBUZZ),
                         PrintRenderTextBackend());
 
 }  // namespace gfx