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

cc/blimp/layer_factory.h

Index: cc/blimp/layer_factory.h
diff --git a/cc/blimp/layer_factory.h b/cc/blimp/layer_factory.h
index c8ff5dd727c678e838eca5145fe5a4b24421abf9..733cc0c1533d0d78a31453b58551ccb586ce8bc9 100644
--- a/cc/blimp/layer_factory.h
+++ b/cc/blimp/layer_factory.h
@@ -7,9 +7,13 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "cc/input/scrollbar.h"
 
 namespace cc {
+class ContentLayerClient;
 class Layer;
+class PictureLayer;
+class SolidColorScrollbarLayer;
 
 // Used to allow tests to inject the Layer created by the
 // CompositorStateDeserializer on the client.
@@ -18,6 +22,18 @@ class LayerFactory {
   virtual ~LayerFactory() {}
 
   virtual scoped_refptr<Layer> CreateLayer(int engine_layer_id) = 0;
+
+  virtual scoped_refptr<PictureLayer> CreatePictureLayer(
+      int engine_layer_id,
+      ContentLayerClient* content_layer_client) = 0;
+
+  virtual scoped_refptr<SolidColorScrollbarLayer>
+  CreateSolidColorScrollbarLayer(int engine_layer_id,
+                                 ScrollbarOrientation orientation,
+                                 int thumb_thickness,
+                                 int track_start,
+                                 bool is_left_side_vertical_scrollbar,
+                                 int scroll_layer_id) = 0;
 };
 
 }  // namespace cc