BrowserMainLoop owns FrameSinkManagerHost

content/browser/renderer_host/offscreen_canvas_provider_impl_unittest.cc

 // Copyright 2017 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 "content/browser/renderer_host/offscreen_canvas_provider_impl.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
@@ skipping 129 matching lines @@
   void DeleteOffscreenCanvasProviderImpl() { provider_.reset(); }
 
   void RunUntilIdle() { base::RunLoop().RunUntilIdle(); }
 
  protected:
   void SetUp() override {
 #if !defined(OS_ANDROID)
     ImageTransportFactory::InitializeForUnitTests(
         std::unique_ptr<ImageTransportFactory>(
             new NoTransportImageTransportFactory));
-    ImageTransportFactory::GetInstance()
-        ->GetContextFactoryPrivate()
-        ->GetFrameSinkManagerHost()
-        ->ConnectToFrameSinkManager();
 #endif
-    provider_ =
-        base::MakeUnique<OffscreenCanvasProviderImpl>(kRendererClientId);
+    frame_sink_manager_host_ = base::MakeUnique<viz::FrameSinkManagerHost>();

[danakj, 2017/06/09 22:43:37]

Please destroy things in TearDown that are created in SetUp.

[Fady Samuel, 2017/06/09 22:52:39]

Done.

+    frame_sink_manager_host_->ConnectToFrameSinkManager();
+    provider_ = base::MakeUnique<OffscreenCanvasProviderImpl>(
+        frame_sink_manager_host_.get(), kRendererClientId);
   }
   void TearDown() override {
     provider_.reset();
 #if !defined(OS_ANDROID)
     ImageTransportFactory::Terminate();
 #endif
   }
 
  private:
   base::MessageLoop message_loop_;
+  std::unique_ptr<viz::FrameSinkManagerHost> frame_sink_manager_host_;
   std::unique_ptr<OffscreenCanvasProviderImpl> provider_;
 };
 
 // Mimics the workflow of OffscreenCanvas.commit() on renderer process.
 TEST_F(OffscreenCanvasProviderImplTest,
        SingleHTMLCanvasElementTransferToOffscreen) {
   // Mimic connection from the renderer main thread to browser.
   StubOffscreenCanvasSurfaceClient surface_client;
   blink::mojom::OffscreenCanvasSurfacePtr surface;
   provider()->CreateOffscreenCanvasSurface(kFrameSinkParent, kFrameSinkA,
@@ skipping 167 matching lines @@
 
   // Mimic closing second connection from the renderer.
   surface_b.reset();
 
   RunUntilIdle();
 
   EXPECT_THAT(GetAllCanvases(), IsEmpty());
 }
 
 }  // namespace content