| Index: third_party/WebKit/LayoutTests/http/tests/security/vibration/resources/vibrate-in-same-origin-iframe-with-user-gesture-allowed.html | 
| diff --git a/third_party/WebKit/LayoutTests/http/tests/security/resources/cross-origin-iframe-for-vibrate-with-user-gesture-allowed.html b/third_party/WebKit/LayoutTests/http/tests/security/vibration/resources/vibrate-in-same-origin-iframe-with-user-gesture-allowed.html | 
| similarity index 59% | 
| rename from third_party/WebKit/LayoutTests/http/tests/security/resources/cross-origin-iframe-for-vibrate-with-user-gesture-allowed.html | 
| rename to third_party/WebKit/LayoutTests/http/tests/security/vibration/resources/vibrate-in-same-origin-iframe-with-user-gesture-allowed.html | 
| index 2e17ce2a6cdcb1aa8038ce16fcf0cbb6b0d9d696..92031383f4a12e9c77546779e1e9edad041d8b5e 100644 | 
| --- a/third_party/WebKit/LayoutTests/http/tests/security/resources/cross-origin-iframe-for-vibrate-with-user-gesture-allowed.html | 
| +++ b/third_party/WebKit/LayoutTests/http/tests/security/vibration/resources/vibrate-in-same-origin-iframe-with-user-gesture-allowed.html | 
| @@ -1,13 +1,10 @@ | 
| <html> | 
| <head> | 
| +    <title>Testing vibrate 3 times in an iframe</title> | 
| <script src="/resources/testharness.js"></script> | 
| <script src="/resources/testharnessreport.js"></script> | 
| +    <script src="/js-test-resources/user-gesture-utils.js"></script> | 
| <script> | 
| -        var test = async_test( | 
| -            "Testing vibrate 3 times in a x-origin iframe: " + | 
| -            " 1. blocked before user gesture;" + | 
| -            " 2. succeed during the click event;" + | 
| -            " 3. succeed after user click."); | 
| function loaded() | 
| { | 
| document.getElementsByTagName('h4')[0].innerHTML = document.domain; | 
| @@ -15,34 +12,30 @@ | 
|  | 
| function startTest(event) | 
| { | 
| -            // A manual click should navigate. | 
| +            // A manual click should enable vibrate. | 
| if (window.eventSender) { | 
| -                var button = document.getElementById("b"); | 
| -                eventSender.mouseMoveTo(button.offsetLeft + event.data.x + 2, button.offsetTop + event.data.y + 2); | 
| -                test.step(function() { | 
| -                  assert_false( | 
| +                test(function() { | 
| +                  assert_true( | 
| navigator.vibrate(200), | 
| -                      "1. Blocked vibrate before user gesture."); | 
| +                      "1. Vibrate w/o user gesture is deprecated and will be blocked in M60."); | 
| }); | 
| - | 
| -                eventSender.mouseDown(); | 
| -                eventSender.mouseUp(); | 
| +                var element = document.getElementById("b"); | 
| +                simulateUserClick(element.offsetLeft + event.data.x + 2, element.offsetTop + event.data.y + 2); | 
| } | 
| } | 
|  | 
| function performTestAfterClick() | 
| { | 
| -           test.step(function () { | 
| +           test(function () { | 
| assert_true( | 
| navigator.vibrate(200), | 
| "3. Vibrate after user gesture succeeded."); | 
| }); | 
| -           test.done(); | 
| } | 
|  | 
| function performTestWithClick() | 
| { | 
| -          test.step(function () { | 
| +          test(function () { | 
| assert_true( | 
| navigator.vibrate(200), | 
| "2. Vibrate triggered by user gesture succeeded."); | 
| @@ -58,3 +51,4 @@ | 
| <button id="b" onclick="performTestWithClick();">Perform Test</button> | 
| </body> | 
| </html> | 
| + | 
|  |