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

cc/layers/layer_unittest.cc

Index: cc/layers/layer_unittest.cc
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index 11d6facce8d015defc9d3e61b7d15aa59541b82e..303464c575519eb8fb9e1c9d307a9b48aea17876 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -360,9 +360,8 @@ class LayerSerializationTest : public testing::Test {
 
   void VerifySolidColorScrollbarLayerAfterSerializationAndDeserialization(
       scoped_refptr<SolidColorScrollbarLayer> source_scrollbar) {
-    proto::LayerProperties serialized_scrollbar;
-    source_scrollbar->LayerSpecificPropertiesToProto(&serialized_scrollbar,
-                                                     false);
+    proto::LayerNode serialized_scrollbar_node;
+    source_scrollbar->ToLayerNodeProto(&serialized_scrollbar_node);
 
     scoped_refptr<SolidColorScrollbarLayer> deserialized_scrollbar =
         SolidColorScrollbarLayer::Create(ScrollbarOrientation::HORIZONTAL, -1,
@@ -372,9 +371,9 @@ class LayerSerializationTest : public testing::Test {
 
     // FromLayerSpecificPropertiesProto expects a non-null LayerTreeHost to be
     // set.
-    deserialized_scrollbar->SetLayerTreeHost(layer_tree_host_.get());
-    deserialized_scrollbar->FromLayerSpecificPropertiesProto(
-        serialized_scrollbar);
+    Layer::LayerIdMap layer_map;
+    deserialized_scrollbar->FromLayerNodeProto(
+        serialized_scrollbar_node, layer_map, layer_tree_host_.get());
 
     EXPECT_EQ(source_scrollbar->solid_color_scrollbar_layer_inputs_.track_start,
               deserialized_scrollbar->solid_color_scrollbar_layer_inputs_