cc/blimp: Add (de)-serialization for PictureLayer and ScrollbarLayer.

cc/test/remote_client_layer_factory.cc

Index: cc/test/remote_client_layer_factory.cc
diff --git a/cc/test/remote_client_layer_factory.cc b/cc/test/remote_client_layer_factory.cc
index 89ba9388983a91115a6bcda0fc87e912bfaf062e..9e29bb40213c3c5697e145f1e3fe79f728fd3fd9 100644
--- a/cc/test/remote_client_layer_factory.cc
+++ b/cc/test/remote_client_layer_factory.cc
@@ -5,6 +5,8 @@
 #include "cc/test/remote_client_layer_factory.h"
 
 #include "cc/layers/layer.h"
+#include "cc/layers/picture_layer.h"
+#include "cc/layers/solid_color_scrollbar_layer.h"
 
 namespace cc {
 namespace {
@@ -15,6 +17,36 @@ class ClientLayer : public Layer {
  private:
   ~ClientLayer() override {}
 };
+
+class ClientPictureLayer : public PictureLayer {
+ public:
+  explicit ClientPictureLayer(int engine_layer_id,
+                              ContentLayerClient* content_layer_client)
+      : PictureLayer(engine_layer_id, content_layer_client) {}
+
+ private:
+  ~ClientPictureLayer() override {}
+};
+
+class ClientSolidColorScrollbarLayer : public SolidColorScrollbarLayer {
+ public:
+  explicit ClientSolidColorScrollbarLayer(int engine_layer_id,
+                                          ScrollbarOrientation orientation,
+                                          int thumb_thickness,
+                                          int track_start,
+                                          bool is_left_side_vertical_scrollbar,
+                                          int scroll_layer_id)
+      : SolidColorScrollbarLayer(engine_layer_id,
+                                 orientation,
+                                 thumb_thickness,
+                                 track_start,
+                                 is_left_side_vertical_scrollbar,
+                                 scroll_layer_id) {}
+
+ private:
+  ~ClientSolidColorScrollbarLayer() override {}
+};
+
 }  // namespace
 
 RemoteClientLayerFactory::RemoteClientLayerFactory() = default;
@@ -26,4 +58,24 @@ scoped_refptr<Layer> RemoteClientLayerFactory::CreateLayer(
   return make_scoped_refptr(new ClientLayer(engine_layer_id));
 }
 
+scoped_refptr<PictureLayer> RemoteClientLayerFactory::CreatePictureLayer(
+    int engine_layer_id,
+    ContentLayerClient* content_layer_client) {
+  return make_scoped_refptr(
+      new ClientPictureLayer(engine_layer_id, content_layer_client));
+}
+
+scoped_refptr<SolidColorScrollbarLayer>
+RemoteClientLayerFactory::CreateSolidColorScrollbarLayer(
+    int engine_layer_id,
+    ScrollbarOrientation orientation,
+    int thumb_thickness,
+    int track_start,
+    bool is_left_side_vertical_scrollbar,
+    int scroll_layer_id) {
+  return make_scoped_refptr(new ClientSolidColorScrollbarLayer(
+      engine_layer_id, orientation, thumb_thickness, track_start,
+      is_left_side_vertical_scrollbar, scroll_layer_id));
+}
+
 }  // namespace cc