Deprecating AutoplayExperimentHelper

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 a4aae0c4f202d3135d9832a01dc30e160b345ac3..6927d3c2012026ec472b49c80c230e5d74f36d8a 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
@@ -34,7 +34,6 @@
 #include "core/dom/ActiveDOMObject.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/events/GenericEventQueue.h"
-#include "core/html/AutoplayExperimentHelper.h"
 #include "core/html/HTMLElement.h"
 #include "core/html/track/TextTrack.h"
 #include "platform/MIMETypeRegistry.h"
@@ -303,8 +302,11 @@ class CORE_EXPORT HTMLMediaElement : public HTMLElement,
   void videoWillBeDrawnToCanvas() const;
 
   // Temporary callback for crbug.com/487345,402044
-  void notifyPositionMayHaveChanged(const IntRect&);
-  void updatePositionNotificationRegistration();
+  //
+  // TODO(zqzhang): remove these callbacks and related plumbing in layout code

[foolip, 2016/11/23 12:40:55]

Can you clean this up now or send a CL based on this showing what it amounts to?
Looks pretty easy to remove.

[Zhiqiang Zhang (Slow), 2016/11/23 18:27:34]

Done.

+  // as AutoplayExperimentHelper is deprecated. See https://crbug.com/666370
+  void notifyPositionMayHaveChanged(const IntRect&) {}
+  void updatePositionNotificationRegistration() {}
 
   WebRemotePlaybackClient* remotePlaybackClient() {
     return m_remotePlaybackClient;
@@ -332,8 +334,6 @@ class CORE_EXPORT HTMLMediaElement : public HTMLElement,
   DisplayMode getDisplayMode() const { return m_displayMode; }
   virtual void setDisplayMode(DisplayMode mode) { m_displayMode = mode; }
 
-  void recordAutoplayMetric(AutoplayMetrics);
-
  private:
   void resetMediaPlayerAndMediaSource();
 
@@ -530,9 +530,6 @@ class CORE_EXPORT HTMLMediaElement : public HTMLElement,
 
   void audioTracksTimerFired(TimerBase*);
 
-  // TODO(liberato): remove once autoplay gesture override experiment concludes.
-  void triggerAutoplayViewportCheckForTesting();
-
   void scheduleResolvePlayPromises();
   void scheduleRejectPlayPromises(ExceptionCode);
   void scheduleNotifyPlaying();
@@ -715,16 +712,11 @@ class CORE_EXPORT HTMLMediaElement : public HTMLElement,
 
   AudioSourceProviderImpl m_audioSourceProvider;
 
-  class AutoplayHelperClientImpl;
-
   friend class AutoplayUmaHelper;  // for isAutoplayAllowedPerSettings
   friend class Internals;
   friend class TrackDisplayUpdateScope;
-  friend class AutoplayExperimentHelper;
   friend class MediaControlsTest;
 
-  Member<AutoplayExperimentHelper::Client> m_autoplayHelperClient;
-  Member<AutoplayExperimentHelper> m_autoplayHelper;
   Member<AutoplayUmaHelper> m_autoplayUmaHelper;
 
   WebRemotePlaybackClient* m_remotePlaybackClient;