Move persistent gesture state to Document, add DocumentUserGestureToken

third_party/WebKit/Source/modules/webaudio/BaseAudioContextTest.cpp

Index: third_party/WebKit/Source/modules/webaudio/BaseAudioContextTest.cpp
diff --git a/third_party/WebKit/Source/modules/webaudio/BaseAudioContextTest.cpp b/third_party/WebKit/Source/modules/webaudio/BaseAudioContextTest.cpp
index 89f73ac0a2c4ac74024a73be89345421ceccf5cb..668324f0d148e82d2e2241ed52d7402aaec98f9e 100644
--- a/third_party/WebKit/Source/modules/webaudio/BaseAudioContextTest.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/BaseAudioContextTest.cpp
@@ -5,6 +5,7 @@
 #include "modules/webaudio/BaseAudioContext.h"
 
 #include "core/dom/Document.h"
+#include "core/dom/DocumentUserGestureToken.h"
 #include "core/frame/FrameOwner.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
@@ -180,8 +181,8 @@ TEST_F(BaseAudioContextTest, AutoplayMetrics_CreateGesture) {
   createChildFrame();
   childDocument().settings()->setMediaPlaybackRequiresUserGesture(true);
 
-  UserGestureIndicator userGestureScope(
-      UserGestureToken::create(UserGestureToken::NewGesture));
+  UserGestureIndicator userGestureScope(DocumentUserGestureToken::create(
+      &childDocument(), UserGestureToken::NewGesture));
 
   BaseAudioContext* audioContext =
       BaseAudioContext::create(childDocument(), ASSERT_NO_EXCEPTION);
@@ -202,8 +203,8 @@ TEST_F(BaseAudioContextTest, AutoplayMetrics_CallResumeGesture) {
   BaseAudioContext* audioContext =
       BaseAudioContext::create(childDocument(), ASSERT_NO_EXCEPTION);
 
-  UserGestureIndicator userGestureScope(
-      UserGestureToken::create(UserGestureToken::NewGesture));
+  UserGestureIndicator userGestureScope(DocumentUserGestureToken::create(
+      &childDocument(), UserGestureToken::NewGesture));
 
   audioContext->resumeContext(getScriptStateFrom(childDocument()));
   rejectPendingResolvers(audioContext);
@@ -237,8 +238,8 @@ TEST_F(BaseAudioContextTest, AutoplayMetrics_NodeStartGesture) {
   BaseAudioContext* audioContext =
       BaseAudioContext::create(childDocument(), ASSERT_NO_EXCEPTION);
 
-  UserGestureIndicator userGestureScope(
-      UserGestureToken::create(UserGestureToken::NewGesture));
+  UserGestureIndicator userGestureScope(DocumentUserGestureToken::create(
+      &childDocument(), UserGestureToken::NewGesture));
   audioContext->maybeRecordStartAttempt();
   recordAutoplayStatus(audioContext);
 
@@ -258,8 +259,8 @@ TEST_F(BaseAudioContextTest, AutoplayMetrics_NodeStartNoGestureThenSuccess) {
       BaseAudioContext::create(childDocument(), ASSERT_NO_EXCEPTION);
   audioContext->maybeRecordStartAttempt();
 
-  UserGestureIndicator userGestureScope(
-      UserGestureToken::create(UserGestureToken::NewGesture));
+  UserGestureIndicator userGestureScope(DocumentUserGestureToken::create(
+      &childDocument(), UserGestureToken::NewGesture));
   audioContext->resumeContext(getScriptStateFrom(childDocument()));
   rejectPendingResolvers(audioContext);
   recordAutoplayStatus(audioContext);
@@ -279,8 +280,8 @@ TEST_F(BaseAudioContextTest, AutoplayMetrics_NodeStartGestureThenSucces) {
   BaseAudioContext* audioContext =
       BaseAudioContext::create(childDocument(), ASSERT_NO_EXCEPTION);
 
-  UserGestureIndicator userGestureScope(
-      UserGestureToken::create(UserGestureToken::NewGesture));
+  UserGestureIndicator userGestureScope(DocumentUserGestureToken::create(
+      &childDocument(), UserGestureToken::NewGesture));
   audioContext->maybeRecordStartAttempt();
   audioContext->resumeContext(getScriptStateFrom(childDocument()));
   rejectPendingResolvers(audioContext);