Chromium Code Reviews| Index: cc/playback/recording_source_unittest.cc |
| diff --git a/cc/playback/recording_source_unittest.cc b/cc/playback/recording_source_unittest.cc |
| index 949fdce3c8d070ade36160a482e6019385475ea8..1c6656cb36880714dfe3a9294cb8d1214af70453 100644 |
| --- a/cc/playback/recording_source_unittest.cc |
| +++ b/cc/playback/recording_source_unittest.cc |
| @@ -6,8 +6,6 @@ |
| #include "cc/playback/display_list_raster_source.h" |
| #include "cc/test/fake_display_list_recording_source.h" |
| -#include "cc/test/fake_picture_pile.h" |
| -#include "cc/test/fake_picture_pile_impl.h" |
| #include "cc/test/skia_common.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| @@ -19,13 +17,6 @@ scoped_ptr<T> CreateRecordingSource(const gfx::Rect& viewport, |
| const gfx::Size& grid_cell_size); |
| template <> |
| -scoped_ptr<FakePicturePile> CreateRecordingSource<FakePicturePile>( |
| - const gfx::Rect& viewport, |
| - const gfx::Size& grid_cell_size) { |
| - return FakePicturePile::CreateFilledPile(grid_cell_size, viewport.size()); |
| -} |
| - |
| -template <> |
| scoped_ptr<FakeDisplayListRecordingSource> CreateRecordingSource< |
| FakeDisplayListRecordingSource>(const gfx::Rect& viewport, |
| const gfx::Size& grid_cell_size) { |
| @@ -43,12 +34,6 @@ scoped_refptr<RasterSource> CreateRasterSource(T* recording_source); |
| template <> |
| scoped_refptr<RasterSource> CreateRasterSource( |
| - FakePicturePile* recording_source) { |
| - return FakePicturePileImpl::CreateFromPile(recording_source, nullptr); |
| -} |
| - |
| -template <> |
| -scoped_refptr<RasterSource> CreateRasterSource( |
| FakeDisplayListRecordingSource* recording_source) { |
| bool can_use_lcd_text = true; |
| return DisplayListRasterSource::CreateFromDisplayListRecordingSource( |
| @@ -60,8 +45,7 @@ class RecordingSourceTest : public testing::Test {}; |
| using testing::Types; |
| -typedef Types<FakePicturePile, FakeDisplayListRecordingSource> |
| - RecordingSourceImplementations; |
| +typedef Types<FakeDisplayListRecordingSource> RecordingSourceImplementations; |
| TYPED_TEST_CASE(RecordingSourceTest, RecordingSourceImplementations); |
|
danakj
2015/09/22 21:52:15
we don't need a TYPED_TEST_CASE anymore, and this
vmpstr
2015/09/22 22:57:49
Incorporated this into the existing display_list_r
|