Don't remove the gesture requirement in the autoplay experiment.

third_party/WebKit/Source/core/html/AutoplayExperimentTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/Document.h"
 #include "core/html/AutoplayExperimentHelper.h"
 #include "platform/UserGestureIndicator.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 62 matching lines @@
     }
 
     virtual ~MockAutoplayClient() {}
 
     MOCK_CONST_METHOD0(currentTime, double());
     MOCK_CONST_METHOD0(duration, double());
     MOCK_CONST_METHOD0(ended, bool());
     MOCK_CONST_METHOD0(muted, bool());
     MOCK_METHOD1(setMuted, void(bool));
     MOCK_METHOD0(playInternal, void());
-    MOCK_CONST_METHOD0(isUserGestureRequiredForPlay, bool());
+    MOCK_CONST_METHOD0(isLockedPendingUserGesture, bool());
     MOCK_METHOD0(removeUserGestureRequirement, void());
     MOCK_METHOD1(recordAutoplayMetric, void(AutoplayMetrics));
     MOCK_METHOD0(shouldAutoplay, bool());
     MOCK_CONST_METHOD0(isHTMLVideoElement, bool());
     MOCK_CONST_METHOD0(isHTMLAudioElement, bool());
     MOCK_METHOD0(isLegacyViewportType, bool());
     MOCK_CONST_METHOD0(pageVisibilityState, PageVisibilityState());
     MOCK_CONST_METHOD0(autoplayExperimentMode, String());
     MOCK_CONST_METHOD0(isCrossOrigin, bool());
     MOCK_CONST_METHOD0(isAutoplayAllowedPerSettings, bool());
@@ skipping 58 matching lines @@
 
     void startPlaybackWithUserGesture()
     {
         UserGestureIndicator indicator(DefinitelyProcessingUserGesture);
         EXPECT_TRUE(UserGestureIndicator::processingUserGesture());
         startPlayback();
     }
 
     void setUserGestureRequiredForPlay(bool required)
     {
-        ON_CALL(*m_client, isUserGestureRequiredForPlay())
+        ON_CALL(*m_client, isLockedPendingUserGesture())
             .WillByDefault(Return(required));
     }
 
     void setShouldAutoplay(bool should)
     {
         ON_CALL(*m_client, shouldAutoplay())
             .WillByDefault(Return(should));
     }
 
     void setIsMuted(bool isMuted)
@@ skipping 73 matching lines @@
 {
     // Audio should not be eligible for video mode.
     setInterface(new NiceMock<MockAutoplayClient>("enabled-forvideo", MockAutoplayClient::Audio));
     EXPECT_FALSE(isEligible());
 }
 
 TEST_F(AutoplayExperimentTest, IsEligibleRequiresUserGesture)
 {
     setInterface(new NiceMock<MockAutoplayClient>("enabled-forvideo", MockAutoplayClient::Video));
     // If a user gesture is not required, then we're not eligible.
-    ON_CALL(*m_client, isUserGestureRequiredForPlay())
+    ON_CALL(*m_client, isLockedPendingUserGesture())
         .WillByDefault(Return(false));
     EXPECT_FALSE(isEligible());
 }
 
 TEST_F(AutoplayExperimentTest, IsEligibleRequiresShouldAutoplay)
 {
     setInterface(new NiceMock<MockAutoplayClient>("enabled-forvideo", MockAutoplayClient::Video));
     // If we shouldn't autoplay, then we're not eligible.
     ON_CALL(*m_client, shouldAutoplay())
         .WillByDefault(Return(false));
@@ skipping 25 matching lines @@
 
     ON_CALL(*m_client, muted())
         .WillByDefault(Return(true));
     EXPECT_TRUE(isEligible());
 }
 
 TEST_F(AutoplayExperimentTest, BecameReadyAutoplayThenBailout)
 {
     setInterface(new NiceMock<MockAutoplayClient>("enabled-forvideo", MockAutoplayClient::Video));
 
-    EXPECT_CALL(*m_client, removeUserGestureRequirement())
-        .Times(1);
     EXPECT_CALL(*m_client, recordAutoplayMetric(AutoplayMediaFound))
         .Times(1);
     m_helper->becameReadyToPlay();
+    EXPECT_TRUE(m_helper->isGestureRequirementOverridden());
 
     EXPECT_CALL(*m_client, recordAutoplayMetric(GesturelessPlaybackStartedByAutoplayFlagImmediately))
         .Times(1);
     startPlaybackWithoutUserGesture();
 
     pausePlaybackExpectingBailout(true);
 }
 
 TEST_F(AutoplayExperimentTest, BecameReadyAutoplayThenPause)
 {
     setInterface(new NiceMock<MockAutoplayClient>("enabled-forvideo", MockAutoplayClient::Video));
 
-    EXPECT_CALL(*m_client, removeUserGestureRequirement())
-        .Times(1);
     EXPECT_CALL(*m_client, recordAutoplayMetric(AutoplayMediaFound))
         .Times(1);
     m_helper->becameReadyToPlay();
+    EXPECT_TRUE(m_helper->isGestureRequirementOverridden());
 
     EXPECT_CALL(*m_client, recordAutoplayMetric(GesturelessPlaybackStartedByAutoplayFlagImmediately))
         .Times(1);
     startPlaybackWithoutUserGesture();
 
     pausePlaybackNotExpectingBailout(true);
 }
 
 TEST_F(AutoplayExperimentTest, BecameReadyAutoplayThenComplete)
 {
     setInterface(new NiceMock<MockAutoplayClient>("enabled-forvideo", MockAutoplayClient::Video));
 
-    EXPECT_CALL(*m_client, removeUserGestureRequirement())
-        .Times(1);
     EXPECT_CALL(*m_client, recordAutoplayMetric(AutoplayMediaFound))
         .Times(1);
     m_helper->becameReadyToPlay();
+    EXPECT_TRUE(m_helper->isGestureRequirementOverridden());
 
     EXPECT_CALL(*m_client, recordAutoplayMetric(GesturelessPlaybackStartedByAutoplayFlagImmediately))
         .Times(1);
     startPlaybackWithoutUserGesture();
 
     // Now stop at the end.
     endPlayback(true);
 }
 
 TEST_F(AutoplayExperimentTest, NoUserGestureNeededShouldNotOverride)
@@ skipping 23 matching lines @@
 
     // Expect bailout, but not from autoplay.
     pausePlaybackExpectingBailout(false);
 }
 
 TEST_F(AutoplayExperimentTest, PlayMethodThenBailout)
 {
     setInterface(new NiceMock<MockAutoplayClient>("enabled-forvideo", MockAutoplayClient::Video));
     setShouldAutoplay(false); // No autoplay attribute.
 
-    EXPECT_CALL(*m_client, removeUserGestureRequirement())
-        .Times(1);
     EXPECT_CALL(*m_client, recordAutoplayMetric(AutoplayMediaFound))
         .Times(1);
-    m_helper->playMethodCalled();
+    m_helper->playMethodCalled(false);
+    EXPECT_TRUE(m_helper->isGestureRequirementOverridden());
 
     EXPECT_CALL(*m_client, recordAutoplayMetric(GesturelessPlaybackStartedByPlayMethodImmediately))
         .Times(1);
     startPlaybackWithoutUserGesture();
 
     pausePlaybackExpectingBailout(true);
 }
 
 TEST_F(AutoplayExperimentTest, DeferAutoplayUntilMuted)
 {
     setInterface(new NiceMock<MockAutoplayClient>("enabled-forvideo-ifmuted", MockAutoplayClient::Video));
 
     // Should not override the gesture requirement yet.
     EXPECT_CALL(*m_client, recordAutoplayMetric(AutoplayMediaFound))
         .Times(1);
     m_helper->becameReadyToPlay();
 
-    // When we toggle the muted attribute, it should start.
-    EXPECT_CALL(*m_client, removeUserGestureRequirement())
-        .Times(1);
-    EXPECT_CALL(*m_client, playInternal())
-        .Times(1);
+    // When we toggle the muted attribute, it should become eligible to start.
+    EXPECT_FALSE(m_helper->isGestureRequirementOverridden());
     setIsMuted(true);
-    m_helper->mutedChanged();
-
-    // When playback starts (in response to playInternal()), it should also
-    // record why.  'After scroll' isn't the best name, but this isn't a common case.
-    EXPECT_CALL(*m_client, recordAutoplayMetric(GesturelessPlaybackStartedByAutoplayFlagAfterScroll))
-        .Times(1);
-    startPlaybackWithoutUserGesture();
+    EXPECT_TRUE(m_helper->isGestureRequirementOverridden());
 }
 
 TEST_F(AutoplayExperimentTest, DeferPlaybackUntilInViewport)
 {
     setInterface(new NiceMock<MockAutoplayClient>("enabled-forvideo-ifviewport", MockAutoplayClient::Video));
 
     // Should not override the gesture requirement yet.
     EXPECT_CALL(*m_client, recordAutoplayMetric(AutoplayMediaFound))
         .Times(1);
     EXPECT_CALL(*m_client, setRequestPositionUpdates(true))
         .Times(1);
     m_helper->becameReadyToPlay();
 
-    EXPECT_CALL(*m_client, removeUserGestureRequirement())
-        .Times(1);
     EXPECT_CALL(*m_client, playInternal())
         .Times(1);
     EXPECT_CALL(*m_client, setRequestPositionUpdates(false))
         .Times(1);
     moveIntoViewport();
+    EXPECT_TRUE(m_helper->isGestureRequirementOverridden());
 }
 
 TEST_F(AutoplayExperimentTest, WithSameOriginTests)
 {
     setInterface(new NiceMock<MockAutoplayClient>("enabled-forvideo-ifsameorigin", MockAutoplayClient::Video));
     ON_CALL(*m_client, isCrossOrigin()).WillByDefault(Return(false));
     EXPECT_TRUE(isEligible());
     ON_CALL(*m_client, isCrossOrigin()).WillByDefault(Return(true));
     EXPECT_FALSE(isEligible());
 }
 
 TEST_F(AutoplayExperimentTest, WithoutSameOriginTests)
 {
     setInterface(new NiceMock<MockAutoplayClient>("enabled-forvideo", MockAutoplayClient::Video));
     ON_CALL(*m_client, isCrossOrigin()).WillByDefault(Return(false));
     EXPECT_TRUE(isEligible());
     ON_CALL(*m_client, isCrossOrigin()).WillByDefault(Return(true));
     EXPECT_TRUE(isEligible());
 }
 
+TEST_F(AutoplayExperimentTest, PlayTwiceIsIgnored)
+{
+    setInterface(new NiceMock<MockAutoplayClient>("enabled-forvideo", MockAutoplayClient::Video));
+    setShouldAutoplay(false); // No autoplay attribute.
+
+    EXPECT_CALL(*m_client, recordAutoplayMetric(AutoplayMediaFound))
+        .Times(1);
+    m_helper->playMethodCalled(false);
+    m_helper->playMethodCalled(true);
 }
+
+}