[blimp] Add SkPicture caching support.

cc/playback/recording_source_unittest.cc

Index: cc/playback/recording_source_unittest.cc
diff --git a/cc/playback/recording_source_unittest.cc b/cc/playback/recording_source_unittest.cc
index 878242db4d39fe3f8914b606a6ba61906a8add1a..f778e9cd46a146b7ac8763591ccae5025244987d 100644
--- a/cc/playback/recording_source_unittest.cc
+++ b/cc/playback/recording_source_unittest.cc
@@ -10,6 +10,7 @@
 #include "cc/proto/recording_source.pb.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_image_serialization_processor.h"
+#include "cc/test/fake_picture_cache.h"
 #include "cc/test/fake_recording_source.h"
 #include "cc/test/skia_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -37,14 +38,25 @@ 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();
+  std::unique_ptr<ClientPictureCache> fake_client_picture_cache =
+      fake_image_serialization_processor->CreateClientPictureCache();
 
+  source->SetEnginePictureCache(fake_engine_picture_cache.get());
   proto::RecordingSource proto;
-  source->ToProtobuf(&proto, fake_image_serialization_processor.get());
+  source->ToProtobuf(&proto);
 
   FakeRecordingSource new_source;
-  new_source.FromProtobuf(proto, fake_image_serialization_processor.get());
+  new_source.SetClientPictureCache(fake_client_picture_cache.get());
+  new_source.FromProtobuf(proto);
 
   EXPECT_TRUE(source->EqualsTo(new_source));
+
+  // The EnginePictureCache and ClientPictureCache go out of scope, so clear
+  // the pointers.
+  source->SetEnginePictureCache(nullptr);
+  new_source.SetClientPictureCache(nullptr);
 }
 
 TEST(RecordingSourceTest, TestNullDisplayListSerialization) {