cc/blimp: Remove Initialize and Close messages.

cc/test/layer_tree_test.cc

 // Copyright 2011 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/test/layer_tree_test.h"
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 444 matching lines @@
   }
   void DisplayDidDrawAndSwap() override {
     hooks_->DisplayDidDrawAndSwapOnThread();
   }
 
  private:
   TestHooks* hooks_;
 };
 
 LayerTreeTest::LayerTreeTest()
-    : remote_proto_channel_bridge_(this),
-      image_serialization_processor_(
+    : image_serialization_processor_(
           base::WrapUnique(new FakeImageSerializationProcessor)),
       delegating_output_surface_client_(
           new LayerTreeTestDelegatingOutputSurfaceClient(this)),
       weak_factory_(this) {
   main_thread_weak_ptr_ = weak_factory_.GetWeakPtr();
 
   // Tests should timeout quickly unless --cc-layer-tree-test-no-timeout was
   // specified (for running in a debugger).
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(switches::kCCLayerTreeTestNoTimeout))
@@ skipping 156 matching lines @@
   DCHECK(!impl_thread_ || impl_thread_->task_runner().get());
 
   if (IsRemoteTest()) {
     DCHECK(impl_thread_);
     layer_tree_host_ = LayerTreeHostForTesting::Create(
         this, mode_, client_.get(), &remote_proto_channel_bridge_.channel_main,
         nullptr, nullptr, task_graph_runner_.get(), settings_,
         base::ThreadTaskRunnerHandle::Get(), nullptr, nullptr,
         image_serialization_processor_.get());
     DCHECK(remote_proto_channel_bridge_.channel_main.HasReceiver());
+
+    LayerTreeSettings settings = settings_;
+    settings.abort_commit_before_output_surface_creation = false;
+    remote_client_layer_tree_host_ = LayerTreeHostForTesting::Create(
+        this, mode_, client_.get(), &remote_proto_channel_bridge_.channel_impl,
+        nullptr, nullptr, task_graph_runner_.get(), settings,
+        base::ThreadTaskRunnerHandle::Get(), impl_thread_->task_runner(),
+        nullptr, image_serialization_processor_.get());
+    DCHECK(remote_proto_channel_bridge_.channel_impl.HasReceiver());
   } else {
     layer_tree_host_ = LayerTreeHostForTesting::Create(
         this, mode_, client_.get(), nullptr, shared_bitmap_manager_.get(),
         gpu_memory_buffer_manager_.get(), task_graph_runner_.get(), settings_,
         base::ThreadTaskRunnerHandle::Get(),
         impl_thread_ ? impl_thread_->task_runner() : nullptr, nullptr,
         image_serialization_processor_.get());
   }
 
   ASSERT_TRUE(layer_tree_host_);
@@ skipping 226 matching lines @@
   return FakeOutputSurface::Create3d(std::move(compositor_context_provider));
 }
 
 void LayerTreeTest::DestroyLayerTreeHost() {
   if (layer_tree_host_ && layer_tree_host_->GetLayerTree()->root_layer())
     layer_tree_host_->GetLayerTree()->root_layer()->SetLayerTreeHost(NULL);
   layer_tree_host_ = nullptr;
 
   DCHECK(!remote_proto_channel_bridge_.channel_main.HasReceiver());
 
-  // Destroying the LayerTreeHost should destroy the remote client
-  // LayerTreeHost.
-  DCHECK(!remote_client_layer_tree_host_);
-}
-
-void LayerTreeTest::DestroyRemoteClientHost() {
-  DCHECK(IsRemoteTest());
-  DCHECK(remote_client_layer_tree_host_);
-
   remote_client_layer_tree_host_ = nullptr;
   DCHECK(!remote_proto_channel_bridge_.channel_impl.HasReceiver());
 }
 
-void LayerTreeTest::CreateRemoteClientHost(
-    const proto::CompositorMessageToImpl& proto) {
-  DCHECK(IsRemoteTest());
-  DCHECK(!remote_client_layer_tree_host_);
-  DCHECK(impl_thread_);
-  DCHECK(proto.message_type() ==
-         proto::CompositorMessageToImpl::INITIALIZE_IMPL);
-
-  LayerTreeSettings settings = settings_;
-  settings.abort_commit_before_output_surface_creation = false;
-  remote_client_layer_tree_host_ = LayerTreeHostForTesting::Create(
-      this, mode_, client_.get(), &remote_proto_channel_bridge_.channel_impl,
-      nullptr, nullptr, task_graph_runner_.get(), settings,
-      base::ThreadTaskRunnerHandle::Get(), impl_thread_->task_runner(), nullptr,
-      image_serialization_processor_.get());
-
-  DCHECK(remote_proto_channel_bridge_.channel_impl.HasReceiver());
-  DCHECK(task_runner_provider()->HasImplThread());
-}
-
 TaskRunnerProvider* LayerTreeTest::task_runner_provider() const {
   // All LayerTreeTests can use the task runner provider to access the impl
   // thread. In the remote mode, the impl thread of the compositor lives on
   // the client, so return the task runner provider owned by the remote client
   // LayerTreeHost.
   LayerTreeHost* host = IsRemoteTest() ? remote_client_layer_tree_host_.get()
                                        : layer_tree_host_.get();
 
   // If this fails, the test has ended and there is no task runners to find
   // anymore.
   DCHECK(host);
 
   return host->GetTaskRunnerProvider();
 }
 
 LayerTreeHost* LayerTreeTest::layer_tree_host() {
   DCHECK(task_runner_provider()->IsMainThread() ||
          task_runner_provider()->IsMainThreadBlocked());
   return layer_tree_host_.get();
 }
 
 LayerTreeHost* LayerTreeTest::remote_client_layer_tree_host() {
   DCHECK(IsRemoteTest());
   DCHECK(task_runner_provider()->IsMainThread() ||
          task_runner_provider()->IsMainThreadBlocked());
   return remote_client_layer_tree_host_.get();
 }
 
 }  // namespace cc