Reenable framebusting

third_party/WebKit/Source/core/dom/DocumentUserGestureToken.h

 // Copyright 2016 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.
 
 #ifndef DocumentUserGestureToken_h
 #define DocumentUserGestureToken_h
 
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
+#include "core/loader/FrameLoaderClient.h"
 #include "platform/UserGestureIndicator.h"
 
 namespace blink {
 
 // Associates a UserGestureToken with a Document, if a non-null Document*
 // is provided in the constructor.
 class DocumentUserGestureToken final : public UserGestureToken {
   WTF_MAKE_NONCOPYABLE(DocumentUserGestureToken);
 
  public:
   static PassRefPtr<UserGestureToken> create(
       Document* document,
       Status status = PossiblyExistingGesture) {
     setHasReceivedUserGesture(document);
     return adoptRef(new DocumentUserGestureToken(status));
   }
 
   static PassRefPtr<UserGestureToken> adopt(Document* document,
                                             UserGestureToken* token) {
     if (!token || !token->hasGestures())
       return nullptr;
     setHasReceivedUserGesture(document);
     return token;
   }
 
  private:
   DocumentUserGestureToken(Status status) : UserGestureToken(status) {}
 
   static void setHasReceivedUserGesture(Document* document) {
-    if (!document || document->hasReceivedUserGesture())
-      return;
-    document->setHasReceivedUserGesture();
-    for (Frame* frame = document->frame()->tree().parent(); frame;
-         frame = frame->tree().parent()) {
-      frame->setDocumentHasReceivedUserGesture();
+    if (document && document->frame() &&
+        !document->frame()->hasReceivedUserGesture()) {
+      document->frame()->setDocumentHasReceivedUserGesture();

[Nate Chapin, 2017/01/18 20:21:37]

Doing this here rather than in FrameLoaderClientImpl so that
DocumentUserGestureTokenTest still works, since it doesn't have a real
FrameLoaderClient.

+      document->frame()->loader().client()->setHasReceivedUserGesture();
     }
   }
 };
 
 }  // namespace blink
 
 #endif  // DocumentUserGestureToken_h