Enable more layer_tree_host_unittest for LayerTreeHostRemote.

cc/blimp/compositor_state_deserializer.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/blimp/compositor_state_deserializer.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "cc/blimp/client_picture_cache.h"
 #include "cc/blimp/compositor_state_deserializer_client.h"
@@ skipping 20 matching lines @@
 
   // LayerFactory implementation.
   scoped_refptr<Layer> CreateLayer(int engine_layer_id) override {
     return Layer::Create();
   }
   scoped_refptr<PictureLayer> CreatePictureLayer(
       int engine_layer_id,
       ContentLayerClient* content_layer_client) override {
     return PictureLayer::Create(content_layer_client);
   }
-
-  scoped_refptr<PictureLayer> CreateFakePictureLayer(
-      int engine_layer_id,
-      ContentLayerClient* content_layer_client) override {
-    // We should never create fake layers in production code.
-    NOTREACHED();
-    return PictureLayer::Create(content_layer_client);
-  }
-
   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) override {
     return SolidColorScrollbarLayer::Create(
         orientation, thumb_thickness, track_start,
         is_left_side_vertical_scrollbar, scroll_layer_id);
   }
+  scoped_refptr<PictureLayer> CreateFakePictureLayer(
+      int engine_layer_id,
+      ContentLayerClient* content_layer_client) override {
+    // We should never create fake layers in production code.
+    NOTREACHED();
+    return PictureLayer::Create(content_layer_client);
+  }
+  scoped_refptr<Layer> CreatePushPropertiesCountingLayer(
+      int engine_layer_id) override {
+    // We should never create fake layers in production code.
+    NOTREACHED();
+    return Layer::Create();
+  }
 };
 
 }  // namespace
 
 CompositorStateDeserializer::LayerData::LayerData() = default;
 
 CompositorStateDeserializer::LayerData::~LayerData() = default;
 
 CompositorStateDeserializer::LayerData::LayerData(LayerData&& other) = default;
 
@@ skipping 293 matching lines @@
     case proto::LayerNode::LAYER:
       layer_data.layer = layer_factory_->CreateLayer(layer_node.id());
       break;
     case proto::LayerNode::PICTURE_LAYER:
       layer_data.content_layer_client =
           base::MakeUnique<DeserializedContentLayerClient>();
       layer_data.layer = layer_factory_->CreatePictureLayer(
           layer_node.id(), layer_data.content_layer_client.get());
       break;
     case proto::LayerNode::FAKE_PICTURE_LAYER:
+      // FAKE_PICTURE_LAYER is for testing only.
       layer_data.content_layer_client =
           base::MakeUnique<DeserializedContentLayerClient>();
       layer_data.layer = layer_factory_->CreateFakePictureLayer(
           layer_node.id(), layer_data.content_layer_client.get());
       break;
     case proto::LayerNode::SOLID_COLOR_SCROLLBAR_LAYER: {
       // SolidColorScrollbarLayers attach their properties in the LayerNode
       // itself.
       const proto::SolidColorScrollbarLayerProperties& scrollbar =
           layer_node.solid_scrollbar();
@@ skipping 12 matching lines @@
 
       // We use the invalid id for the |scroll_layer_id| because the
       // corresponding layer on the client may not have been created yet.
       layer_data.layer = layer_factory_->CreateSolidColorScrollbarLayer(
           layer_node.id(), orientation, thumb_thickness, track_start,
           is_left_side_vertical_scrollbar, Layer::LayerIdLabels::INVALID_ID);
     } break;
     case proto::LayerNode::HEADS_UP_DISPLAY_LAYER:
       // TODO(khushalsagar): Remove this from proto.
       NOTREACHED();
+      break;
+    case proto::LayerNode::PUSH_PROPERTIES_COUNTING_LAYER:
+      // PUSH_PROPERTIES_COUNTING_LAYER is for testing only.
+      layer_data.layer =
+          layer_factory_->CreatePushPropertiesCountingLayer(layer_node.id());
+      break;
   }
 
   layer = layer_data.layer;
   return layer;
 }
 
 int CompositorStateDeserializer::GetClientIdFromEngineId(
     int engine_layer_id) const {
   Layer* layer = GetLayerForEngineId(engine_layer_id);
   return layer ? layer->id() : Layer::LayerIdLabels::INVALID_ID;
@@ skipping 10 matching lines @@
 DeserializedContentLayerClient*
 CompositorStateDeserializer::GetContentLayerClient(int engine_layer_id) const {
   EngineIdToLayerMap::const_iterator layer_it =
       engine_id_to_layer_.find(engine_layer_id);
   return layer_it != engine_id_to_layer_.end()
              ? layer_it->second.content_layer_client.get()
              : nullptr;
 }
 
 }  // namespace cc