[blimp] Add SkPicture caching support.

cc/playback/display_item_list_unittest.cc

Index: cc/playback/display_item_list_unittest.cc
diff --git a/cc/playback/display_item_list_unittest.cc b/cc/playback/display_item_list_unittest.cc
index 41ae5bac507e18667b0997203bd662a9ff52499b..7a9bf4c4d5385baf88affd0a5de7dfac1d7bb6fb 100644
--- a/cc/playback/display_item_list_unittest.cc
+++ b/cc/playback/display_item_list_unittest.cc
@@ -21,6 +21,7 @@
 #include "cc/playback/transform_display_item.h"
 #include "cc/proto/display_item.pb.h"
 #include "cc/test/fake_image_serialization_processor.h"
+#include "cc/test/fake_picture_cache.h"
 #include "cc/test/skia_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -83,12 +84,21 @@ void ValidateDisplayItemListSerialization(const gfx::Size& layer_size,
   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();
+  std::unique_ptr<ClientPictureCache> fake_client_picture_cache =
+      fake_image_serialization_processor->CreateClientPictureCache();
 
   // Serialize and deserialize the DisplayItemList.
   proto::DisplayItemList proto;
-  list->ToProtobuf(&proto, fake_image_serialization_processor.get());
-  scoped_refptr<DisplayItemList> new_list = DisplayItemList::CreateFromProto(
-      proto, fake_image_serialization_processor.get());
+  list->ToProtobuf(&proto);
+
+  // Marking the list for registration ends up adding all the SkPictures to the
+  // cache.
+  list->MarkForRegistrationEngine(fake_engine_picture_cache.get());
+
+  scoped_refptr<DisplayItemList> new_list =
+      DisplayItemList::CreateFromProto(proto, fake_client_picture_cache.get());
 
   EXPECT_TRUE(
       AreDisplayListDrawingResultsSame(gfx::Rect(layer_size), list, new_list));