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

cc/layers/solid_color_scrollbar_layer.h

Index: cc/layers/solid_color_scrollbar_layer.h
diff --git a/cc/layers/solid_color_scrollbar_layer.h b/cc/layers/solid_color_scrollbar_layer.h
index 2855753af5d7a115726401e9794271bb545dd806..2a11453b28a286819255a70b133d15bc9142e09c 100644
--- a/cc/layers/solid_color_scrollbar_layer.h
+++ b/cc/layers/solid_color_scrollbar_layer.h
@@ -28,6 +28,10 @@ class CC_EXPORT SolidColorScrollbarLayer : public ScrollbarLayerInterface,
   bool OpacityCanAnimateOnImplThread() const override;
   bool AlwaysUseActiveTreeOpacity() const override;
   ScrollbarLayerInterface* ToScrollbarLayer() override;
+  void ToLayerNodeProto(proto::LayerNode* proto) const override;
+  void FromLayerNodeProto(const proto::LayerNode& proto,
+                          const LayerIdMap& layer_map,
+                          LayerTreeHost* layer_tree_host) override;
 
   void SetOpacity(float opacity) override;
   void PushPropertiesTo(LayerImpl* layer) override;
@@ -50,10 +54,6 @@ class CC_EXPORT SolidColorScrollbarLayer : public ScrollbarLayerInterface,
 
   // Layer overrides for proto conversions.
   void SetTypeForProtoSerialization(proto::LayerNode* proto) const override;
-  void LayerSpecificPropertiesToProto(proto::LayerProperties* proto,
-                                      bool inputs_only) override;
-  void FromLayerSpecificPropertiesProto(
-      const proto::LayerProperties& proto) override;
 
  private:
   friend class LayerSerializationTest;