Autoplay experiment metric fixes and additions.

third_party/WebKit/Source/core/html/HTMLMediaElement.h

Index: third_party/WebKit/Source/core/html/HTMLMediaElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.h b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
index 980f33aa210609a2dc9eb0c08ff41aa2e52a4cab..38574f697704c2d5cd19dd56a73c237bf8e7082e 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
@@ -140,7 +140,7 @@ public:
     TimeRanges* seekable() const;
     bool ended() const;
     bool autoplay() const;
-    enum class RecordMetricsBehavior { DoNotRecord, DoRecord };
+    enum class RecordMetricsBehavior { DoNotRecord, RecordOnSandboxFailure };
     bool shouldAutoplay(const RecordMetricsBehavior = RecordMetricsBehavior::DoNotRecord);
     bool loop() const;
     void setLoop(bool);
@@ -280,6 +280,8 @@ protected:
     DisplayMode displayMode() const { return m_displayMode; }
     virtual void setDisplayMode(DisplayMode mode) { m_displayMode = mode; }
 
+    void recordAutoplayMetric(AutoplayMetrics);
+
 private:
     void resetMediaPlayerAndMediaSource();
 
@@ -390,7 +392,6 @@ private:
     // Could stopping at this point be considered a bailout of playback?
     // (as in, "The user really didn't want to play this").
     bool isBailout() const;
-    void autoplayMediaEncountered();
     void allowVideoRendering();
 
     void updateVolume();
@@ -422,8 +423,6 @@ private:
 
     void setAllowHiddenVolumeControls(bool);
 
-    void recordAutoplayMetric(AutoplayMetrics);
-
     WebMediaPlayer::CORSMode corsMode() const;
 
     // Returns the "direction of playback" value as specified in the HTML5 spec.
@@ -444,7 +443,7 @@ private:
     // the media play.
     bool isUserGestureRequiredForPlay() const;
     void removeUserGestureRequirement();
-    void setInitialPlayWithoutUserGestures(bool);
+    void autoplayMediaEncountered();
 
     void setNetworkState(NetworkState);
 
@@ -626,6 +625,12 @@ private:
 
     AutoplayExperimentHelper m_autoplayHelper;
 
+    // Did we process a user gesture at any point?
+    bool m_anyUserGestureEncountered;

[philipj_slow, 2015/11/25 14:03:42]

Can these be put on the AutoplayExperimentHelper instead?

[liberato (no reviews please), 2015/11/25 18:58:54]

Removed.

+
+    // Did we record metrics for our initial playback?
+    bool m_initialPlaybackRecorded;
+
     static URLRegistry* s_mediaStreamRegistry;
 };