cc: Rename DisplayListRasterSource to just RasterSource.

cc/test/fake_raster_source.cc

Index: cc/test/fake_raster_source.cc
diff --git a/cc/test/fake_display_list_raster_source.cc b/cc/test/fake_raster_source.cc
similarity index 61%
rename from cc/test/fake_display_list_raster_source.cc
rename to cc/test/fake_raster_source.cc
index 8acca504aa6ca2e4c2d0029d1998ef70eed59386..53625c69735e406bf8ebd3e29ef8eff7fad95878 100644
--- a/cc/test/fake_display_list_raster_source.cc
+++ b/cc/test/fake_raster_source.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cc/test/fake_display_list_raster_source.h"
+#include "cc/test/fake_raster_source.h"
 
 #include <limits>
 
@@ -13,15 +13,14 @@
 
 namespace cc {
 
-scoped_refptr<FakeDisplayListRasterSource>
-FakeDisplayListRasterSource::CreateInfiniteFilled() {
+scoped_refptr<FakeRasterSource> FakeRasterSource::CreateInfiniteFilled() {
   gfx::Size size(std::numeric_limits<int>::max() / 10,
                  std::numeric_limits<int>::max() / 10);
   return CreateFilled(size);
 }
 
-scoped_refptr<FakeDisplayListRasterSource>
-FakeDisplayListRasterSource::CreateFilled(const gfx::Size& size) {
+scoped_refptr<FakeRasterSource> FakeRasterSource::CreateFilled(
+    const gfx::Size& size) {
   auto recording_source =
       FakeDisplayListRecordingSource::CreateFilledRecordingSource(size);
 
@@ -38,11 +37,11 @@ FakeDisplayListRasterSource::CreateFilled(const gfx::Size& size) {
   recording_source->Rerecord();
 
   return make_scoped_refptr(
-      new FakeDisplayListRasterSource(recording_source.get(), false));
+      new FakeRasterSource(recording_source.get(), false));
 }
 
-scoped_refptr<FakeDisplayListRasterSource>
-FakeDisplayListRasterSource::CreateFilledLCD(const gfx::Size& size) {
+scoped_refptr<FakeRasterSource> FakeRasterSource::CreateFilledLCD(
+    const gfx::Size& size) {
   auto recording_source =
       FakeDisplayListRecordingSource::CreateFilledRecordingSource(size);
 
@@ -58,12 +57,11 @@ FakeDisplayListRasterSource::CreateFilledLCD(const gfx::Size& size) {
 
   recording_source->Rerecord();
 
-  return make_scoped_refptr(
-      new FakeDisplayListRasterSource(recording_source.get(), true));
+  return make_scoped_refptr(new FakeRasterSource(recording_source.get(), true));
 }
 
-scoped_refptr<FakeDisplayListRasterSource>
-FakeDisplayListRasterSource::CreateFilledSolidColor(const gfx::Size& size) {
+scoped_refptr<FakeRasterSource> FakeRasterSource::CreateFilledSolidColor(
+    const gfx::Size& size) {
   auto recording_source =
       FakeDisplayListRecordingSource::CreateFilledRecordingSource(size);
 
@@ -71,15 +69,14 @@ FakeDisplayListRasterSource::CreateFilledSolidColor(const gfx::Size& size) {
   red_paint.setColor(SK_ColorRED);
   recording_source->add_draw_rect_with_paint(gfx::Rect(size), red_paint);
   recording_source->Rerecord();
-  auto raster_source = make_scoped_refptr(
-      new FakeDisplayListRasterSource(recording_source.get(), false));
+  auto raster_source =
+      make_scoped_refptr(new FakeRasterSource(recording_source.get(), false));
   if (!raster_source->IsSolidColor())
     ADD_FAILURE() << "Not solid color!";
   return raster_source;
 }
 
-scoped_refptr<FakeDisplayListRasterSource>
-FakeDisplayListRasterSource::CreatePartiallyFilled(
+scoped_refptr<FakeRasterSource> FakeRasterSource::CreatePartiallyFilled(
     const gfx::Size& size,
     const gfx::Rect& recorded_viewport) {
   DCHECK(recorded_viewport.IsEmpty() ||
@@ -101,60 +98,58 @@ FakeDisplayListRasterSource::CreatePartiallyFilled(
   recording_source->SetRecordedViewport(recorded_viewport);
 
   return make_scoped_refptr(
-      new FakeDisplayListRasterSource(recording_source.get(), false));
+      new FakeRasterSource(recording_source.get(), false));
 }
 
-scoped_refptr<FakeDisplayListRasterSource>
-FakeDisplayListRasterSource::CreateEmpty(const gfx::Size& size) {
+scoped_refptr<FakeRasterSource> FakeRasterSource::CreateEmpty(
+    const gfx::Size& size) {
   auto recording_source =
       FakeDisplayListRecordingSource::CreateFilledRecordingSource(size);
   return make_scoped_refptr(
-      new FakeDisplayListRasterSource(recording_source.get(), false));
+      new FakeRasterSource(recording_source.get(), false));
 }
 
-scoped_refptr<FakeDisplayListRasterSource>
-FakeDisplayListRasterSource::CreateFromRecordingSource(
+scoped_refptr<FakeRasterSource> FakeRasterSource::CreateFromRecordingSource(
     const DisplayListRecordingSource* recording_source,
     bool can_use_lcd) {
   return make_scoped_refptr(
-      new FakeDisplayListRasterSource(recording_source, can_use_lcd));
+      new FakeRasterSource(recording_source, can_use_lcd));
 }
 
-scoped_refptr<FakeDisplayListRasterSource>
-FakeDisplayListRasterSource::CreateFromRecordingSourceWithWaitable(
+scoped_refptr<FakeRasterSource>
+FakeRasterSource::CreateFromRecordingSourceWithWaitable(
     const DisplayListRecordingSource* recording_source,
     bool can_use_lcd,
     base::WaitableEvent* playback_allowed_event) {
-  return make_scoped_refptr(new FakeDisplayListRasterSource(
-      recording_source, can_use_lcd, playback_allowed_event));
+  return make_scoped_refptr(new FakeRasterSource(recording_source, can_use_lcd,
+                                                 playback_allowed_event));
 }
 
-FakeDisplayListRasterSource::FakeDisplayListRasterSource(
+FakeRasterSource::FakeRasterSource(
     const DisplayListRecordingSource* recording_source,
     bool can_use_lcd)
-    : DisplayListRasterSource(recording_source, can_use_lcd),
+    : RasterSource(recording_source, can_use_lcd),
       playback_allowed_event_(nullptr) {}
 
-FakeDisplayListRasterSource::FakeDisplayListRasterSource(
+FakeRasterSource::FakeRasterSource(
     const DisplayListRecordingSource* recording_source,
     bool can_use_lcd,
     base::WaitableEvent* playback_allowed_event)
-    : DisplayListRasterSource(recording_source, can_use_lcd),
+    : RasterSource(recording_source, can_use_lcd),
       playback_allowed_event_(playback_allowed_event) {}
 
-FakeDisplayListRasterSource::~FakeDisplayListRasterSource() {}
+FakeRasterSource::~FakeRasterSource() {}
 
-void FakeDisplayListRasterSource::PlaybackToCanvas(
-    SkCanvas* canvas,
-    const gfx::Rect& canvas_bitmap_rect,
-    const gfx::Rect& canvas_playback_rect,
-    float contents_scale,
-    bool include_images) const {
+void FakeRasterSource::PlaybackToCanvas(SkCanvas* canvas,
+                                        const gfx::Rect& canvas_bitmap_rect,
+                                        const gfx::Rect& canvas_playback_rect,
+                                        float contents_scale,
+                                        bool include_images) const {
   if (playback_allowed_event_)
     playback_allowed_event_->Wait();
-  DisplayListRasterSource::PlaybackToCanvas(canvas, canvas_bitmap_rect,
-                                            canvas_playback_rect,
-                                            contents_scale, include_images);
+  RasterSource::PlaybackToCanvas(canvas, canvas_bitmap_rect,
+                                 canvas_playback_rect, contents_scale,
+                                 include_images);
 }
 
 }  // namespace cc