Do not log Display Compositor latency component twice.

Now that renderer Compositor Frames go through SurfaceFactory,
we don't need to log DISPLAY_COMPOSITOR_RECEIVED_FRAME_COMPONENT
in RenderWidgetHostLatencyTracker.

BUG=NONE
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel

Review-Url: https://codereview.chromium.org/2863503002
Cr-Commit-Position: refs/heads/master@{#469481}

cc/surfaces/surface_factory.cc

@@ -51,6 +51,11 @@ void SurfaceFactory::SubmitCompositorFrame(
   TRACE_EVENT0("cc", "SurfaceFactory::SubmitCompositorFrame");
   DCHECK(local_surface_id.is_valid());
 
+  if (!ui::LatencyInfo::Verify(frame.metadata.latency_info,
+                               "RenderWidgetHostImpl::OnSwapCompositorFrame")) {
+    std::vector<ui::LatencyInfo>().swap(frame.metadata.latency_info);
+  }
+
   for (ui::LatencyInfo& latency : frame.metadata.latency_info) {
     if (latency.latency_components().size() > 0) {
       latency.AddLatencyNumber(ui::DISPLAY_COMPOSITOR_RECEIVED_FRAME_COMPONENT,

content/browser/renderer_host/input/render_widget_host_latency_tracker.cc

@@ -281,8 +281,6 @@ void RenderWidgetHostLatencyTracker::OnSwapCompositorFrame(
   DCHECK(latencies);
   for (LatencyInfo& latency : *latencies) {
     AddLatencyInfoComponentIds(&latency, latency_component_id_);
-    latency.AddLatencyNumber(ui::DISPLAY_COMPOSITOR_RECEIVED_FRAME_COMPONENT, 0,
-                             0);
   }
 }
 

content/browser/renderer_host/render_widget_host_impl.cc

@@ -2569,11 +2569,6 @@ void RenderWidgetHostImpl::SubmitCompositorFrame(
   // |has_damage| is not transmitted.
   frame.metadata.begin_frame_ack.has_damage = true;
 
-  if (!ui::LatencyInfo::Verify(frame.metadata.latency_info,
-                               "RenderWidgetHostImpl::OnSwapCompositorFrame")) {
-    std::vector<ui::LatencyInfo>().swap(frame.metadata.latency_info);
-  }
-
   last_frame_metadata_ = frame.metadata.Clone();
 
   latency_tracker_.OnSwapCompositorFrame(&frame.metadata.latency_info);