Update RenderFrameMetadataProvider creation time

RenderFrameMetadataProvider(RFMP) is not available until calling
RWHI::RequestCompositorFrameSink, that is no observer can be added before
that point, which may not be convenient for all observers. In this patch,
RenderFrameMetadataProvider will be created in RenderWidgetHostImpl
constructor and the ready to receive and send information after calling
RequestCompositorFrameSink.

For Example: RenderWidgetHostViewAura is created and start to observe changes
in RFM before calling RWHI::RequestCompositorFrameSink.

Bug: 716911

Change-Id: Icac9d5ff44a24b2a828bb7946202917f79c93147
Reviewed-on: https://chromium-review.googlesource.com/952200
Commit-Queue: Yi Xu <yiyix@chromium.org>
Reviewed-by: Fady Samuel <fsamuel@chromium.org>
Reviewed-by: Jonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541645}

content/browser/renderer_host/render_frame_metadata_provider_impl.cc

@@ -6,14 +6,8 @@
 
 namespace content {
 
-RenderFrameMetadataProviderImpl::RenderFrameMetadataProviderImpl(
-    mojom::RenderFrameMetadataObserverClientRequest client_request,
-    mojom::RenderFrameMetadataObserverPtr observer)
-    : render_frame_metadata_observer_client_binding_(this),
-      render_frame_metadata_observer_ptr_(std::move(observer)) {
-  render_frame_metadata_observer_client_binding_.Bind(
-      std::move(client_request));
-}
+RenderFrameMetadataProviderImpl::RenderFrameMetadataProviderImpl()
+    : render_frame_metadata_observer_client_binding_(this) {}
 
 RenderFrameMetadataProviderImpl::~RenderFrameMetadataProviderImpl() = default;
 
@@ -25,8 +19,18 @@ void RenderFrameMetadataProviderImpl::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
+void RenderFrameMetadataProviderImpl::Bind(
+    mojom::RenderFrameMetadataObserverClientRequest client_request,
+    mojom::RenderFrameMetadataObserverPtr observer) {
+  render_frame_metadata_observer_ptr_ = std::move(observer);
+  render_frame_metadata_observer_client_binding_.Close();
+  render_frame_metadata_observer_client_binding_.Bind(
+      std::move(client_request));
+}
+
 void RenderFrameMetadataProviderImpl::ReportAllFrameSubmissionsForTesting(
     bool enabled) {
+  DCHECK(render_frame_metadata_observer_ptr_);
   render_frame_metadata_observer_ptr_->ReportAllFrameSubmissionsForTesting(
       enabled);
 }

content/browser/renderer_host/render_frame_metadata_provider_impl.h

@@ -25,14 +25,15 @@ class RenderFrameMetadataProviderImpl
     : public RenderFrameMetadataProvider,
       public mojom::RenderFrameMetadataObserverClient {
  public:
-  RenderFrameMetadataProviderImpl(
-      mojom::RenderFrameMetadataObserverClientRequest client_request,
-      mojom::RenderFrameMetadataObserverPtr observer);
+  RenderFrameMetadataProviderImpl();
   ~RenderFrameMetadataProviderImpl() override;
 
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;
 
+  void Bind(mojom::RenderFrameMetadataObserverClientRequest client_request,
+            mojom::RenderFrameMetadataObserverPtr observer);
+
   // Notifies the renderer to begin sending a notification on all frame
   // submissions.
   void ReportAllFrameSubmissionsForTesting(bool enabled) override;

content/browser/renderer_host/render_widget_host_impl.cc

@@ -57,7 +57,6 @@
 #include "content/browser/renderer_host/input/synthetic_gesture_target.h"
 #include "content/browser/renderer_host/input/timeout_monitor.h"
 #include "content/browser/renderer_host/input/touch_emulator.h"
-#include "content/browser/renderer_host/render_frame_metadata_provider_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
@@ -2684,10 +2683,9 @@ void RenderWidgetHostImpl::RequestCompositorFrameSink(
     mojom::RenderFrameMetadataObserverClientRequest
         render_frame_metadata_observer_client_request,
     mojom::RenderFrameMetadataObserverPtr render_frame_metadata_observer) {
-  render_frame_metadata_provider_ =
-      std::make_unique<RenderFrameMetadataProviderImpl>(
-          std::move(render_frame_metadata_observer_client_request),
-          std::move(render_frame_metadata_observer));
+  render_frame_metadata_provider_.Bind(
+      std::move(render_frame_metadata_observer_client_request),
+      std::move(render_frame_metadata_observer));
   if (enable_viz_) {
       // Connects the viz process end of CompositorFrameSink message pipes. The
       // renderer compositor may request a new CompositorFrameSink on context

content/browser/renderer_host/render_widget_host_impl.h

@@ -38,6 +38,7 @@
 #include "content/browser/renderer_host/input/synthetic_gesture.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_controller.h"
 #include "content/browser/renderer_host/input/touch_emulator_client.h"
+#include "content/browser/renderer_host/render_frame_metadata_provider_impl.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/common/drag_event_source_info.h"
@@ -602,7 +603,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
   }
 
   RenderFrameMetadataProvider* render_frame_metadata_provider() {
-    return render_frame_metadata_provider_.get();
+    return &render_frame_metadata_provider_;
   }
 
   bool HasGestureStopped() override;
@@ -1090,7 +1091,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
 
   bool next_resize_needs_resize_ack_ = false;
 
-  std::unique_ptr<RenderFrameMetadataProvider> render_frame_metadata_provider_;
+  RenderFrameMetadataProviderImpl render_frame_metadata_provider_;
 
   const viz::FrameSinkId frame_sink_id_;