Remove dead TestImageTransportFactory code

We no longer need to support the case where VizDisplayCompositor is
disabled.

Bug: 936425
Change-Id: I7118a44740959a4fed14a8f4befebe295762d2a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1985815
Commit-Queue: weiliangc <weiliangc@chromium.org>
Reviewed-by: weiliangc <weiliangc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728104}

content/browser/compositor/test/test_image_transport_factory.cc

@@ -7,11 +7,6 @@
 #include <limits>
 #include <utility>
 
-#include "components/viz/common/features.h"
-#include "components/viz/service/display_embedder/server_shared_bitmap_manager.h"
-#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
-#include "components/viz/test/test_frame_sink_manager.h"
-#include "content/browser/compositor/surface_utils.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "ui/compositor/test/in_process_context_provider.h"
@@ -25,46 +20,31 @@ constexpr uint32_t kDefaultClientId = std::numeric_limits<uint32_t>::max();
 }  // namespace
 
 TestImageTransportFactory::TestImageTransportFactory()
-    : enable_viz_(features::IsVizDisplayCompositorEnabled()),
-      frame_sink_id_allocator_(kDefaultClientId) {
-  if (enable_viz_) {
-    test_frame_sink_manager_impl_ =
-        std::make_unique<viz::TestFrameSinkManagerImpl>();
-
-    mojo::PendingRemote<viz::mojom::FrameSinkManager> frame_sink_manager;
-    mojo::PendingReceiver<viz::mojom::FrameSinkManager>
-        frame_sink_manager_receiver =
-            frame_sink_manager.InitWithNewPipeAndPassReceiver();
-    mojo::PendingRemote<viz::mojom::FrameSinkManagerClient>
-        frame_sink_manager_client;
-    mojo::PendingReceiver<viz::mojom::FrameSinkManagerClient>
-        frame_sink_manager_client_receiver =
-            frame_sink_manager_client.InitWithNewPipeAndPassReceiver();
-
-    // Bind endpoints in HostFrameSinkManager.
-    host_frame_sink_manager_.BindAndSetManager(
-        std::move(frame_sink_manager_client_receiver), nullptr,
-        std::move(frame_sink_manager));
-
-    // Bind endpoints in TestFrameSinkManagerImpl. For non-tests there would be
-    // a FrameSinkManagerImpl running in another process and these interface
-    // endpoints would be bound there.
-    test_frame_sink_manager_impl_->BindReceiver(
-        std::move(frame_sink_manager_receiver),
-        std::move(frame_sink_manager_client));
-  } else {
-    shared_bitmap_manager_ = std::make_unique<viz::ServerSharedBitmapManager>();
-    frame_sink_manager_impl_ = std::make_unique<viz::FrameSinkManagerImpl>(
-        shared_bitmap_manager_.get());
-    surface_utils::ConnectWithLocalFrameSinkManager(
-        &host_frame_sink_manager_, frame_sink_manager_impl_.get());
-  }
+    : frame_sink_id_allocator_(kDefaultClientId) {
+  mojo::PendingRemote<viz::mojom::FrameSinkManager> frame_sink_manager;
+  mojo::PendingReceiver<viz::mojom::FrameSinkManager>
+      frame_sink_manager_receiver =
+          frame_sink_manager.InitWithNewPipeAndPassReceiver();
+  mojo::PendingRemote<viz::mojom::FrameSinkManagerClient>
+      frame_sink_manager_client;
+  mojo::PendingReceiver<viz::mojom::FrameSinkManagerClient>
+      frame_sink_manager_client_receiver =
+          frame_sink_manager_client.InitWithNewPipeAndPassReceiver();
+
+  // Bind endpoints in HostFrameSinkManager.
+  host_frame_sink_manager_.BindAndSetManager(
+      std::move(frame_sink_manager_client_receiver), nullptr,
+      std::move(frame_sink_manager));
+
+  // Bind endpoints in TestFrameSinkManagerImpl. For non-tests there would be
+  // a FrameSinkManagerImpl running in another process and these interface
+  // endpoints would be bound there.
+  test_frame_sink_manager_impl_.BindReceiver(
+      std::move(frame_sink_manager_receiver),
+      std::move(frame_sink_manager_client));
 }
 
-TestImageTransportFactory::~TestImageTransportFactory() {
-  for (auto& observer : observer_list_)
-    observer.OnLostSharedContext();
-}
+TestImageTransportFactory::~TestImageTransportFactory() = default;
 
 void TestImageTransportFactory::CreateLayerTreeFrameSink(
     base::WeakPtr<ui::Compositor> compositor) {
@@ -103,16 +83,6 @@ cc::TaskGraphRunner* TestImageTransportFactory::GetTaskGraphRunner() {
   return &task_graph_runner_;
 }
 
-void TestImageTransportFactory::AddObserver(
-    ui::ContextFactoryObserver* observer) {
-  observer_list_.AddObserver(observer);
-}
-
-void TestImageTransportFactory::RemoveObserver(
-    ui::ContextFactoryObserver* observer) {
-  observer_list_.RemoveObserver(observer);
-}
-
 viz::FrameSinkId TestImageTransportFactory::AllocateFrameSinkId() {
   return frame_sink_id_allocator_.NextFrameSinkId();
 }

content/browser/compositor/test/test_image_transport_factory.h

@@ -8,13 +8,13 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "base/observer_list.h"
 #include "build/build_config.h"
 #include "cc/test/fake_layer_tree_frame_sink.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "components/viz/common/display/renderer_settings.h"
 #include "components/viz/common/surfaces/frame_sink_id_allocator.h"
 #include "components/viz/host/host_frame_sink_manager.h"
+#include "components/viz/test/test_frame_sink_manager.h"
 #include "components/viz/test/test_gpu_memory_buffer_manager.h"
 #include "components/viz/test/test_image_factory.h"
 #include "content/browser/compositor/image_transport_factory.h"
@@ -22,12 +22,6 @@
 #include "services/viz/privileged/mojom/compositing/vsync_parameter_observer.mojom.h"
 #include "ui/compositor/compositor.h"
 
-namespace viz {
-class FrameSinkManagerImpl;
-class ServerSharedBitmapManager;
-class TestFrameSinkManagerImpl;
-}  // namespace viz
-
 namespace content {
 
 // Test implementation of ImageTransportFactory, ContextFactory and
@@ -47,12 +41,11 @@ class TestImageTransportFactory : public ui::ContextFactory,
       override;
   scoped_refptr<viz::RasterContextProvider>
   SharedMainThreadRasterContextProvider() override;
-
   void RemoveCompositor(ui::Compositor* compositor) override {}
   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
   cc::TaskGraphRunner* GetTaskGraphRunner() override;
-  void AddObserver(ui::ContextFactoryObserver* observer) override;
-  void RemoveObserver(ui::ContextFactoryObserver* observer) override;
+  void AddObserver(ui::ContextFactoryObserver* observer) override {}
+  void RemoveObserver(ui::ContextFactoryObserver* observer) override {}
 
   // ui::ContextFactoryPrivate implementation.
   viz::FrameSinkId AllocateFrameSinkId() override;
@@ -86,23 +79,14 @@ class TestImageTransportFactory : public ui::ContextFactory,
   ui::ContextFactoryPrivate* GetContextFactoryPrivate() override;
 
  private:
-  const bool enable_viz_;
-
   cc::TestTaskGraphRunner task_graph_runner_;
   viz::TestImageFactory image_factory_;
   viz::TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
   viz::RendererSettings renderer_settings_;
   viz::FrameSinkIdAllocator frame_sink_id_allocator_;
   scoped_refptr<viz::ContextProvider> shared_main_context_provider_;
-  base::ObserverList<ui::ContextFactoryObserver>::Unchecked observer_list_;
   viz::HostFrameSinkManager host_frame_sink_manager_;
-
-  // Objects that exist if |enable_viz_| is false.
-  std::unique_ptr<viz::ServerSharedBitmapManager> shared_bitmap_manager_;
-  std::unique_ptr<viz::FrameSinkManagerImpl> frame_sink_manager_impl_;
-
-  // Objects that exist if |enable_viz_| is true.
-  std::unique_ptr<viz::TestFrameSinkManagerImpl> test_frame_sink_manager_impl_;
+  viz::TestFrameSinkManagerImpl test_frame_sink_manager_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(TestImageTransportFactory);
 };