Reenable framebusting deprecation, change it to allow navigation if iframe has ever had a user gestu

third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/resources/iframe-that-performs-parent-navigation-async.html

Index: third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/resources/iframe-that-performs-parent-navigation-async.html
diff --git a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/resources/iframe-that-performs-parent-navigation.html b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/resources/iframe-that-performs-parent-navigation-async.html
similarity index 59%
copy from third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/resources/iframe-that-performs-parent-navigation.html
copy to third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/resources/iframe-that-performs-parent-navigation-async.html
index aaff6f66f4509ef4e535fe1ad3c183dc848a14fc..39a265382abb2b7d823d5fd710988310f5bbad3f 100644
--- a/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/resources/iframe-that-performs-parent-navigation.html
+++ b/third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/resources/iframe-that-performs-parent-navigation-async.html
@@ -19,7 +19,15 @@
 
         function performTest()
         {
-            parent.location = "http://localhost:8000/security/frameNavigation/resources/navigation-changed-iframe.html";
+            // User gestures are propagated through a single setTimeout(), but
+            // not nested setTimeout()s. Ensure that the user gesture token
+            // doesn't propagate, but that the navigation goes through anyway,
+            // because there was a user gesture in this iframe previously.
+            setTimeout(function() {
+                setTimeout(function() {
+                    parent.location = "http://localhost:8000/security/frameNavigation/resources/navigation-changed-iframe.html";
+                }, 0);
+            }, 0);
         }
 
         window.addEventListener("message", startTest, false);