Merge M58: "Don't histogram paint time after ending or seeking."

media/blink/webmediaplayer_impl.h

Index: media/blink/webmediaplayer_impl.h
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
index 8a5cfd9e82d68946b9c6b01bb210b0f2f0b6dbce..8c38a041af540d166acdfbbd75b2b2599e230358 100644
--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
@@ -708,6 +708,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerImpl
   // the background. Affects the value of ShouldPauseVideoWhenHidden().
   bool video_locked_when_paused_when_hidden_ = false;
 
+  base::CancelableCallback<void(base::TimeTicks)> frame_time_report_cb_;
+
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };