Rename paint data structures

cc/test/fake_scrollbar.cc

 // Copyright 2013 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 "cc/test/fake_scrollbar.h"
 
-#include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/skia_util.h"
 
 namespace cc {
 
 FakeScrollbar::FakeScrollbar()
     : FakeScrollbar(false, false, HORIZONTAL, false, false) {}
 
 FakeScrollbar::FakeScrollbar(bool paint, bool has_thumb, bool is_overlay)
     : FakeScrollbar(paint, has_thumb, HORIZONTAL, false, is_overlay) {}
 
@@ skipping 46 matching lines @@
 float FakeScrollbar::ThumbOpacity() const {
   return thumb_opacity_;
 }
 
 bool FakeScrollbar::NeedsPaintPart(ScrollbarPart part) const {
   if (part == THUMB)
     return needs_paint_thumb_;
   return needs_paint_track_;
 }
 
-void FakeScrollbar::PaintPart(SkCanvas* canvas,
-                             ScrollbarPart part,
-                             const gfx::Rect& content_rect) {
+void FakeScrollbar::PaintPart(PaintCanvas* canvas,
+                              ScrollbarPart part,
+                              const gfx::Rect& content_rect) {
   if (!paint_)
     return;
 
   // Fill the scrollbar with a different color each time.
   fill_color_++;
   SkPaint paint;
   paint.setAntiAlias(false);
   paint.setColor(paint_fill_color());
   paint.setStyle(SkPaint::kFill_Style);
 
   // Emulate the how the real scrollbar works by using scrollbar's rect for
   // TRACK and the given content_rect for the THUMB
   SkRect rect = part == TRACK ? RectToSkRect(TrackRect())
                               : RectToSkRect(content_rect);
   canvas->drawRect(rect, paint);
 }
 
 }  // namespace cc