cc: Add SwapPromiseManager and SurfaceSequenceGenerator.

cc/trees/layer_tree_host_unittest_serialization.cc

 // Copyright 2015 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/trees/layer_tree_host.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "cc/layers/empty_content_layer_client.h"
@@ skipping 191 matching lines @@
     }
     if (layer_tree_src->outer_viewport_scroll_layer()) {
       EXPECT_EQ(layer_tree_src->outer_viewport_scroll_layer()->id(),
                 layer_tree_dst->outer_viewport_scroll_layer()->id());
     } else {
       EXPECT_FALSE(layer_tree_dst->outer_viewport_scroll_layer());
     }
     EXPECT_EQ(layer_tree_src->inputs_.selection,
               layer_tree_dst->inputs_.selection);
     EXPECT_EQ(layer_tree_src->property_trees_, layer_tree_dst->property_trees_);
-    EXPECT_EQ(layer_tree_host_src_->surface_client_id_,
-              layer_tree_host_dst_->surface_client_id_);
-    EXPECT_EQ(layer_tree_host_src_->next_surface_sequence_,
-              layer_tree_host_dst_->next_surface_sequence_);
 
     // All layers must have a property tree index that matches PropertyTrees.
     if (layer_tree_dst->property_trees_.sequence_number) {
       int seq_num = layer_tree_dst->property_trees_.sequence_number;
       LayerTreeHostCommon::CallFunctionForEveryLayer(
           layer_tree_host_dst_->GetLayerTree(), [seq_num](Layer* layer) {
             EXPECT_EQ(seq_num, layer->property_tree_sequence_number());
           });
     }
   }
@@ skipping 68 matching lines @@
 
     LayerSelectionBound sel_bound;
     sel_bound.edge_top = gfx::Point(14, 3);
     LayerSelection selection;
     selection.start = sel_bound;
     layer_tree_src->inputs_.selection = selection;
 
     layer_tree_src->property_trees_.sequence_number =
         layer_tree_src->property_trees_.sequence_number * 3 + 1;
 
-    layer_tree_host_src_->surface_client_id_ =
-        layer_tree_host_src_->surface_client_id_ * 3 + 1;
-    layer_tree_host_src_->next_surface_sequence_ =
-        layer_tree_host_src_->next_surface_sequence_ * 3 + 1;
-
     VerifySerializationAndDeserialization();
   }
 
   void RunLayersChangedTest() {
     // Just fake setup a layer for both source and dest.
     scoped_refptr<Layer> root_layer_src = Layer::Create();
     layer_tree_host_src_->SetRootLayer(root_layer_src);
     layer_tree_host_dst_->SetRootLayer(Layer::Create());
     root_layer_src->SetDoubleSided(!root_layer_src->double_sided());
 
@@ skipping 144 matching lines @@
 
 TEST_F(LayerTreeHostSerializationTest, AddAndRemoveNodeFromLayerTree) {
   RunAddAndRemoveNodeFromLayerTree();
 }
 
 TEST_F(LayerTreeHostSerializationTest, PictureLayerMultipleSerializations) {
   RunPictureLayerMultipleSerializationsTest();
 }
 
 }  // namespace cc