 +  void EndFrameSubscription() override;
    void OnBeginFramePausedChanged(bool paused) override;
  
-   // Exposed for tests.
-@@ -258,6 +261,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
+   // viz::HostFrameSinkClient implementation.
+@@ -302,6 +305,8 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
    // The surface client ID of the parent RenderWidgetHostView.  0 if none.
    viz::FrameSinkId parent_frame_sink_id_;
  
 +  std::unique_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
 +
    bool has_frame_ = false;
-   cc::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink_ =
+   viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink_ =
        nullptr;

diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc
index 69115f67c799..a2d83b8fa7b5 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.cc
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc
@@ -31,12 +31,14 @@
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_input_event_router.h"

 #include "services/service_manager/runner/common/client_util.h"
 #include "third_party/WebKit/public/platform/WebTouchEvent.h"
 #include "ui/gfx/geometry/size_conversions.h"
@@ -931,6 +933,30 @@ void RenderWidgetHostViewChildFrame::ResetCompositorFrameSinkSupport() {
   support_.reset();
 }
 
