Revert of cc/blimp: Add a LayerTreeHostRemote implementation.

cc/blimp/layer_tree_host_remote_unittest.cc

Index: cc/blimp/layer_tree_host_remote_unittest.cc
diff --git a/cc/blimp/layer_tree_host_remote_unittest.cc b/cc/blimp/layer_tree_host_remote_unittest.cc
deleted file mode 100644
index 035eeb0461a9b245c61589eb6fd8f5bbbc0b512a..0000000000000000000000000000000000000000
--- a/cc/blimp/layer_tree_host_remote_unittest.cc
+++ /dev/null
@@ -1,344 +0,0 @@
-// 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/layer_tree_host_remote.h"
-
-#include "base/bind.h"
-#include "base/run_loop.h"
-#include "base/threading/thread_task_runner_handle.h"
-#include "cc/animation/animation_host.h"
-#include "cc/layers/layer.h"
-#include "cc/output/begin_frame_args.h"
-#include "cc/test/fake_remote_compositor_bridge.h"
-#include "cc/test/stub_layer_tree_host_client.h"
-#include "cc/trees/layer_tree_settings.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using ::testing::_;
-using testing::InSequence;
-using testing::Mock;
-using testing::StrictMock;
-
-#define EXPECT_BEGIN_MAIN_FRAME(client, num)                \
-  EXPECT_CALL(client, WillBeginMainFrame()).Times(num);     \
-  EXPECT_CALL(client, BeginMainFrame(_)).Times(num);        \
-  EXPECT_CALL(client, DidUpdateLayerTreeHost()).Times(num); \
-  EXPECT_CALL(client, WillCommit()).Times(num);             \
-  EXPECT_CALL(client, DidCommit()).Times(num);              \
-  EXPECT_CALL(client, DidBeginMainFrame()).Times(num);
-
-#define EXPECT_BEGIN_MAIN_FRAME_AND_COMMIT(client, num)    \
-  EXPECT_BEGIN_MAIN_FRAME(client, num)                     \
-  EXPECT_CALL(client, DidCommitAndDrawFrame()).Times(num); \
-  EXPECT_CALL(client, DidCompleteSwapBuffers()).Times(num);
-
-namespace cc {
-namespace {
-
-class UpdateTrackingRemoteCompositorBridge : public FakeRemoteCompositorBridge {
- public:
-  UpdateTrackingRemoteCompositorBridge(
-      scoped_refptr<base::SingleThreadTaskRunner> compositor_main_task_runner)
-      : FakeRemoteCompositorBridge(std::move(compositor_main_task_runner)) {}
-
-  ~UpdateTrackingRemoteCompositorBridge() override = default;
-
-  void ProcessCompositorStateUpdate(
-      std::unique_ptr<CompositorProtoState> compositor_proto_state) override {
-    num_updates_received_++;
-  };
-
-  int num_updates_received() const { return num_updates_received_; }
-
- private:
-  int num_updates_received_ = 0;
-};
-
-class MockLayerTreeHostClient : public StubLayerTreeHostClient {
- public:
-  MockLayerTreeHostClient() = default;
-  ~MockLayerTreeHostClient() override = default;
-
-  void set_update_host_callback(base::Closure callback) {
-    update_host_callback_ = callback;
-  }
-
-  void UpdateLayerTreeHost() override {
-    update_host_callback_.Run();
-    DidUpdateLayerTreeHost();
-  }
-
-  // LayerTreeHostClient implementation.
-  MOCK_METHOD0(WillBeginMainFrame, void());
-  MOCK_METHOD1(BeginMainFrame, void(const BeginFrameArgs& args));
-  MOCK_METHOD0(DidBeginMainFrame, void());
-  MOCK_METHOD0(DidUpdateLayerTreeHost, void());
-  MOCK_METHOD0(WillCommit, void());
-  MOCK_METHOD0(DidCommit, void());
-  MOCK_METHOD0(DidCommitAndDrawFrame, void());
-  MOCK_METHOD0(DidCompleteSwapBuffers, void());
-
- private:
-  base::Closure update_host_callback_;
-};
-
-class MockLayer : public Layer {
- public:
-  explicit MockLayer(bool update) : update_(update) {}
-
-  bool Update() override {
-    did_update_ = true;
-    return update_;
-  }
-
-  bool did_update() const { return did_update_; }
-
- private:
-  ~MockLayer() override {}
-
-  bool update_;
-  bool did_update_ = false;
-};
-
-class MockLayerTree : public LayerTree {
- public:
-  MockLayerTree(std::unique_ptr<AnimationHost> animation_host,
-                LayerTreeHost* layer_tree_host)
-      : LayerTree(std::move(animation_host), layer_tree_host) {}
-  ~MockLayerTree() override {}
-
-  // We don't want tree sync requests to trigger commits.
-  void SetNeedsFullTreeSync() override {}
-};
-
-class LayerTreeHostRemoteForTesting : public LayerTreeHostRemote {
- public:
-  explicit LayerTreeHostRemoteForTesting(InitParams* params)
-      : LayerTreeHostRemote(
-            params,
-            base::MakeUnique<MockLayerTree>(AnimationHost::CreateMainInstance(),
-                                            this)) {}
-  ~LayerTreeHostRemoteForTesting() override {}
-};
-
-class LayerTreeHostRemoteTest : public testing::Test {
- public:
-  LayerTreeHostRemoteTest() {
-    mock_layer_tree_host_client_.set_update_host_callback(base::Bind(
-        &LayerTreeHostRemoteTest::UpdateLayerTreeHost, base::Unretained(this)));
-  }
-  ~LayerTreeHostRemoteTest() override {}
-
-  void SetUp() override {
-    LayerTreeHostRemote::InitParams params;
-    params.client = &mock_layer_tree_host_client_;
-    scoped_refptr<base::SingleThreadTaskRunner> main_task_runner =
-        base::ThreadTaskRunnerHandle::Get();
-    params.main_task_runner = main_task_runner;
-    std::unique_ptr<UpdateTrackingRemoteCompositorBridge>
-        remote_compositor_bridge =
-            base::MakeUnique<UpdateTrackingRemoteCompositorBridge>(
-                main_task_runner);
-    remote_compositor_bridge_ = remote_compositor_bridge.get();
-    params.remote_compositor_bridge = std::move(remote_compositor_bridge);
-    LayerTreeSettings settings;
-    params.settings = &settings;
-
-    layer_tree_host_ = base::MakeUnique<LayerTreeHostRemoteForTesting>(&params);
-    root_layer_ = make_scoped_refptr(new MockLayer(false));
-    layer_tree_host_->GetLayerTree()->SetRootLayer(root_layer_);
-  }
-
-  void TearDown() override {
-    Mock::VerifyAndClearExpectations(&mock_layer_tree_host_client_);
-    layer_tree_host_ = nullptr;
-    root_layer_ = nullptr;
-    remote_compositor_bridge_ = nullptr;
-  }
-
-  void UpdateLayerTreeHost() {
-    if (needs_animate_during_main_frame_) {
-      layer_tree_host_->SetNeedsAnimate();
-      needs_animate_during_main_frame_ = false;
-    }
-
-    if (needs_commit_during_main_frame_) {
-      layer_tree_host_->SetNeedsCommit();
-      needs_commit_during_main_frame_ = false;
-    }
-  }
-
-  void set_needs_animate_during_main_frame(bool needs) {
-    needs_animate_during_main_frame_ = needs;
-  }
-
-  void set_needs_commit_during_main_frame(bool needs) {
-    needs_commit_during_main_frame_ = needs;
-  }
-
- protected:
-  std::unique_ptr<LayerTreeHostRemote> layer_tree_host_;
-  StrictMock<MockLayerTreeHostClient> mock_layer_tree_host_client_;
-  UpdateTrackingRemoteCompositorBridge* remote_compositor_bridge_ = nullptr;
-  scoped_refptr<MockLayer> root_layer_;
-
-  bool needs_animate_during_main_frame_ = false;
-  bool needs_commit_during_main_frame_ = false;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(LayerTreeHostRemoteTest);
-};
-
-TEST_F(LayerTreeHostRemoteTest, BeginMainFrameAnimateOnly) {
-  // The main frame should run until the animate step only.
-  InSequence s;
-  int num_of_frames = 1;
-  EXPECT_BEGIN_MAIN_FRAME(mock_layer_tree_host_client_, num_of_frames);
-
-  int previous_source_frame = layer_tree_host_->SourceFrameNumber();
-  layer_tree_host_->SetNeedsAnimate();
-
-  base::RunLoop().RunUntilIdle();
-  EXPECT_FALSE(root_layer_->did_update());
-  EXPECT_EQ(0, remote_compositor_bridge_->num_updates_received());
-  EXPECT_EQ(++previous_source_frame, layer_tree_host_->SourceFrameNumber());
-}
-
-TEST_F(LayerTreeHostRemoteTest, BeginMainFrameUpdateLayers) {
-  // The main frame should run until the update layers step only.
-  InSequence s;
-  int num_of_frames = 1;
-  EXPECT_BEGIN_MAIN_FRAME(mock_layer_tree_host_client_, num_of_frames);
-
-  int previous_source_frame = layer_tree_host_->SourceFrameNumber();
-  layer_tree_host_->SetNeedsUpdateLayers();
-
-  base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(root_layer_->did_update());
-  EXPECT_EQ(0, remote_compositor_bridge_->num_updates_received());
-  EXPECT_EQ(++previous_source_frame, layer_tree_host_->SourceFrameNumber());
-}
-
-TEST_F(LayerTreeHostRemoteTest, BeginMainFrameCommit) {
-  // The main frame should run until the commit step.
-  InSequence s;
-  int num_of_frames = 1;
-  EXPECT_BEGIN_MAIN_FRAME_AND_COMMIT(mock_layer_tree_host_client_,
-                                     num_of_frames);
-
-  int previous_source_frame = layer_tree_host_->SourceFrameNumber();
-  layer_tree_host_->SetNeedsCommit();
-
-  base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(root_layer_->did_update());
-  EXPECT_EQ(1, remote_compositor_bridge_->num_updates_received());
-  EXPECT_EQ(++previous_source_frame, layer_tree_host_->SourceFrameNumber());
-}
-
-TEST_F(LayerTreeHostRemoteTest, BeginMainFrameMultipleRequests) {
-  // Multiple BeginMainFrame requests should result in a single main frame
-  // update.
-  InSequence s;
-  int num_of_frames = 1;
-  EXPECT_BEGIN_MAIN_FRAME_AND_COMMIT(mock_layer_tree_host_client_,
-                                     num_of_frames);
-
-  layer_tree_host_->SetNeedsAnimate();
-  layer_tree_host_->SetNeedsUpdateLayers();
-  layer_tree_host_->SetNeedsCommit();
-
-  base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(root_layer_->did_update());
-  EXPECT_EQ(1, remote_compositor_bridge_->num_updates_received());
-}
-
-TEST_F(LayerTreeHostRemoteTest, CommitRequestThenDeferCommits) {
-  // Make a commit request, followed by a request to defer commits.
-  layer_tree_host_->SetNeedsCommit();
-  layer_tree_host_->SetDeferCommits(true);
-
-  // We should not have seen any BeginMainFrames.
-  base::RunLoop().RunUntilIdle();
-  Mock::VerifyAndClearExpectations(&mock_layer_tree_host_client_);
-  EXPECT_FALSE(root_layer_->did_update());
-  EXPECT_EQ(0, remote_compositor_bridge_->num_updates_received());
-
-  // Now enable commits and ensure we see a BeginMainFrame.
-  layer_tree_host_->SetDeferCommits(false);
-  InSequence s;
-  int num_of_frames = 1;
-  EXPECT_BEGIN_MAIN_FRAME_AND_COMMIT(mock_layer_tree_host_client_,
-                                     num_of_frames);
-  base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(root_layer_->did_update());
-  EXPECT_EQ(1, remote_compositor_bridge_->num_updates_received());
-}
-
-TEST_F(LayerTreeHostRemoteTest, DeferCommitsThenCommitRequest) {
-  // Defer commits followed by a commit request.
-  layer_tree_host_->SetDeferCommits(true);
-  layer_tree_host_->SetNeedsCommit();
-
-  // We should not have seen any BeginMainFrames.
-  base::RunLoop().RunUntilIdle();
-  Mock::VerifyAndClearExpectations(&mock_layer_tree_host_client_);
-  EXPECT_FALSE(root_layer_->did_update());
-  EXPECT_EQ(0, remote_compositor_bridge_->num_updates_received());
-
-  // Now enable commits and ensure we see a BeginMainFrame.
-  layer_tree_host_->SetDeferCommits(false);
-  InSequence s;
-  int num_of_frames = 1;
-  EXPECT_BEGIN_MAIN_FRAME_AND_COMMIT(mock_layer_tree_host_client_,
-                                     num_of_frames);
-  base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(root_layer_->did_update());
-  EXPECT_EQ(1, remote_compositor_bridge_->num_updates_received());
-}
-
-TEST_F(LayerTreeHostRemoteTest, RequestAnimateDuringMainFrame) {
-  // An animate request during BeginMainFrame should result in a second main
-  // frame being scheduled.
-  set_needs_animate_during_main_frame(true);
-  int num_of_frames = 2;
-  EXPECT_BEGIN_MAIN_FRAME(mock_layer_tree_host_client_, num_of_frames);
-
-  layer_tree_host_->SetNeedsAnimate();
-
-  base::RunLoop().RunUntilIdle();
-  EXPECT_FALSE(root_layer_->did_update());
-  EXPECT_EQ(0, remote_compositor_bridge_->num_updates_received());
-}
-
-TEST_F(LayerTreeHostRemoteTest, RequestCommitDuringMainFrame) {
-  // A commit request during a BeginMainFrame scheduled for an animate request
-  // should go till the commit stage.
-  set_needs_commit_during_main_frame(true);
-  int num_of_frames = 1;
-  EXPECT_BEGIN_MAIN_FRAME_AND_COMMIT(mock_layer_tree_host_client_,
-                                     num_of_frames);
-
-  layer_tree_host_->SetNeedsAnimate();
-
-  base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(root_layer_->did_update());
-  EXPECT_EQ(1, remote_compositor_bridge_->num_updates_received());
-}
-
-TEST_F(LayerTreeHostRemoteTest, RequestCommitDuringLayerUpdates) {
-  // A layer update during a main frame should result in a commit.
-  scoped_refptr<Layer> child_layer = make_scoped_refptr(new MockLayer(true));
-  root_layer_->AddChild(child_layer);
-  EXPECT_BEGIN_MAIN_FRAME_AND_COMMIT(mock_layer_tree_host_client_, 1);
-
-  layer_tree_host_->SetNeedsUpdateLayers();
-
-  base::RunLoop().RunUntilIdle();
-  EXPECT_TRUE(root_layer_->did_update());
-  EXPECT_EQ(1, remote_compositor_bridge_->num_updates_received());
-}
-
-}  // namespace
-}  // namespace cc