cc: Clean up RecordingSource API

cc/playback/recording_source_unittest.cc

 // Copyright 2015 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 <vector>
 
 #include "base/memory/ptr_util.h"
 #include "cc/base/region.h"
 #include "cc/playback/raster_source.h"
 #include "cc/proto/recording_source.pb.h"
@@ skipping 19 matching lines @@
 }
 
 scoped_refptr<RasterSource> CreateRasterSource(
     FakeRecordingSource* recording_source) {
   bool can_use_lcd_text = true;
   return RasterSource::CreateFromRecordingSource(recording_source,
                                                  can_use_lcd_text);
 }
 
 void ValidateRecordingSourceSerialization(FakeRecordingSource* source) {
-  std::unique_ptr<FakeImageSerializationProcessor>
-      fake_image_serialization_processor =
-          base::WrapUnique(new FakeImageSerializationProcessor);
-  std::unique_ptr<EnginePictureCache> fake_engine_picture_cache =
-      fake_image_serialization_processor->CreateEnginePictureCache();
-  FakeEnginePictureCache* fake_engine_picture_cache_ptr =
-      static_cast<FakeEnginePictureCache*>(fake_engine_picture_cache.get());
-  std::unique_ptr<ClientPictureCache> fake_client_picture_cache =
-      fake_image_serialization_processor->CreateClientPictureCache();
-
-  fake_engine_picture_cache_ptr->MarkAllSkPicturesAsUsed(
-      source->GetDisplayItemList());
-
   proto::RecordingSource proto;
   source->ToProtobuf(&proto);
 
-  std::vector<uint32_t> actual_picture_ids;
   FakeRecordingSource new_source;
-  new_source.FromProtobuf(proto, fake_client_picture_cache.get(),
-                          &actual_picture_ids);
-
-  EXPECT_THAT(actual_picture_ids,
-              testing::UnorderedElementsAreArray(
-                  fake_engine_picture_cache_ptr->GetAllUsedPictureIds()));
+  new_source.FromProtobuf(proto, nullptr);
 
   EXPECT_TRUE(source->EqualsTo(new_source));
 }
 
 TEST(RecordingSourceTest, TestNullDisplayListSerialization) {
   gfx::Rect recorded_viewport(0, 0, 256, 256);
 
   std::unique_ptr<FakeRecordingSource> recording_source =
       CreateRecordingSource(recorded_viewport);
   recording_source->SetDisplayListUsesCachedPicture(false);
@@ skipping 370 matching lines @@
                                               &images);
     EXPECT_EQ(3u, images.size());
     EXPECT_TRUE(images[0].image() == discardable_image[0][0]);
     EXPECT_TRUE(images[1].image() == discardable_image[0][1]);
     EXPECT_TRUE(images[2].image() == discardable_image[1][1]);
   }
 }
 
 }  // namespace
 }  // namespace cc