Convert offscreen canvas to use FrameSinkManagerHost.

services/ui/surfaces/display_compositor.h

 // Copyright 2015 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.
 
 #ifndef SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 21 matching lines @@
 class DisplayCompositor
     : public cc::SurfaceObserver,
       public display_compositor::GpuCompositorFrameSinkDelegate,
       public cc::mojom::DisplayCompositor {
  public:
   DisplayCompositor(DisplayProvider* display_provider,
                     cc::mojom::DisplayCompositorRequest request,
                     cc::mojom::DisplayCompositorClientPtr client);
   ~DisplayCompositor() override;
 
-  cc::SurfaceManager* manager() { return &manager_; }
+  cc::SurfaceManager* surface_manager() { return &manager_; }
 
   // cc::mojom::DisplayCompositor implementation:
   void CreateRootCompositorFrameSink(
       const cc::FrameSinkId& frame_sink_id,
       gpu::SurfaceHandle surface_handle,
       cc::mojom::MojoCompositorFrameSinkAssociatedRequest request,
       cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client,
       cc::mojom::DisplayPrivateAssociatedRequest display_private_request)
       override;
@@ skipping 46 matching lines @@
 
   cc::mojom::DisplayCompositorClientPtr client_;
   mojo::Binding<cc::mojom::DisplayCompositor> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayCompositor);
 };
 
 }  // namespace ui
 
 #endif  //  SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_