cc: Add SwapPromiseManager and SurfaceSequenceGenerator.

cc/layers/surface_layer_unittest.cc

 // Copyright 2014 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 <stdint.h>
 
 #include <set>
 #include <vector>
 
 #include "base/location.h"
@@ skipping 56 matching lines @@
 TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) {
   SurfaceSequence blank_change;  // Receives sequence if commit doesn't happen.
 
   SurfaceId required_id;
   std::set<SurfaceSequence> required_seq;
   scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create(
       base::Bind(&SatisfyCallback, &blank_change),
       base::Bind(&RequireCallback, &required_id, &required_seq)));
   layer->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f,
                       gfx::Size(1, 1));
-  layer_tree_host_->SetSurfaceClientId(1);
+  layer_tree_host_->GetSurfaceSequenceGenerator()->set_surface_client_id(1);
   layer_tree_->SetRootLayer(layer);
 
   std::unique_ptr<FakeLayerTreeHost> layer_tree_host2 =
       FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_);
   scoped_refptr<SurfaceLayer> layer2(SurfaceLayer::Create(
       base::Bind(&SatisfyCallback, &blank_change),
       base::Bind(&RequireCallback, &required_id, &required_seq)));
   layer2->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f,
                        gfx::Size(1, 1));
-  layer_tree_host2->SetSurfaceClientId(2);
+  layer_tree_host2->GetSurfaceSequenceGenerator()->set_surface_client_id(2);
   layer_tree_host2->SetRootLayer(layer2);
 
   // Layers haven't been removed, so no sequence should be satisfied.
   EXPECT_TRUE(blank_change.is_null());
 
   SurfaceSequence expected1(1u, 1u);
   SurfaceSequence expected2(2u, 1u);
 
   layer_tree_host2->SetRootLayer(nullptr);
   layer_tree_host2.reset();
@@ skipping 21 matching lines @@
   EXPECT_EQ(2u, required_seq.size());
 }
 
 // Check that SurfaceSequence is sent through swap promise.
 class SurfaceLayerSwapPromise : public LayerTreeTest {
  public:
   SurfaceLayerSwapPromise()
       : commit_count_(0), sequence_was_satisfied_(false) {}
 
   void BeginTest() override {
-    layer_tree_host()->SetSurfaceClientId(1);
+    layer_tree_host()->GetSurfaceSequenceGenerator()->set_surface_client_id(1);
     layer_ = SurfaceLayer::Create(
         base::Bind(&SatisfyCallback, &satisfied_sequence_),
         base::Bind(&RequireCallback, &required_id_, &required_set_));
     layer_->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f,
                          gfx::Size(1, 1));
 
     // Layer hasn't been added to tree so no SurfaceSequence generated yet.
     EXPECT_EQ(0u, required_set_.size());
 
     layer_tree()->SetRootLayer(layer_);
@@ skipping 110 matching lines @@
     EXPECT_EQ(1u, required_set_.size());
     // Sequence should have been satisfied with the callback.
     EXPECT_TRUE(satisfied_sequence_ == SurfaceSequence(1u, 1u));
   }
 };
 
 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithoutDraw);
 
 }  // namespace
 }  // namespace cc