Import wpt@767dc2a4f049c761bd146d61de2ea860a895a624

third_party/WebKit/LayoutTests/external/wpt/user-timing/test_user_timing_measure_exceptions.html

Index: third_party/WebKit/LayoutTests/external/wpt/user-timing/test_user_timing_measure_exceptions.html
diff --git a/third_party/WebKit/LayoutTests/external/wpt/user-timing/test_user_timing_measure_exceptions.html b/third_party/WebKit/LayoutTests/external/wpt/user-timing/test_user_timing_measure_exceptions.html
index 18a8ba1afa9b802557ae332432af7b13eb5bb7bd..3f73accf53440b6c7d3a5be8dd7c2cfe3477ab83 100644
--- a/third_party/WebKit/LayoutTests/external/wpt/user-timing/test_user_timing_measure_exceptions.html
+++ b/third_party/WebKit/LayoutTests/external/wpt/user-timing/test_user_timing_measure_exceptions.html
@@ -10,30 +10,6 @@
         <script src="resources/webperftestharness.js"></script>
 
     <script type="text/javascript">
-        // navigation timing attributes
-        var timingAttributes = [
-            'connectEnd',
-            'connectStart',
-            'domComplete',
-            'domContentLoadedEventEnd',
-            'domContentLoadedEventStart',
-            'domInteractive',
-            'domLoading',
-            'domainLookupEnd',
-            'domainLookupStart',
-            'fetchStart',
-            'loadEventEnd',
-            'loadEventStart',
-            'navigationStart',
-            'redirectEnd',
-            'redirectStart',
-            'requestStart',
-            'responseEnd',
-            'responseStart',
-            'unloadEventEnd',
-            'unloadEventStart'
-        ];
-
         // test data
         var zeroedNavTimingAtt = undefined;
 
@@ -44,13 +20,7 @@
         function onload_test()
         {
             // test for existance of User Timing and Performance Timeline interface
-            if (window.performance.mark == undefined ||
-                window.performance.clearMarks == undefined ||
-                window.performance.measure == undefined ||
-                window.performance.clearMeasures == undefined ||
-                window.performance.getEntriesByName == undefined ||
-                window.performance.getEntriesByType == undefined ||
-                window.performance.getEntries == undefined)
+            if (!has_required_interfaces())
             {
                 test_true(false,
                           "The User Timing and Performance Timeline interfaces, which are required for this test, " +