Bug 1186833 - register-same-scope-different-script-url.https.html fixes. r=bkelly

Update web-platform-tests expected data

--HG--
extra : commitid : 9yd5tNcT5rG
extra : rebase_source : 8478afbeae962f7decac7ab55fa5ea8f39eb4878

testing/web-platform/mozilla/meta/service-workers/service-worker/register-same-scope-different-script-url.https.html.ini

@@ -1,6 +0,0 @@
-[register-same-scope-different-script-url.https.html]
-  type: testharness
-  expected: TIMEOUT
-  [Register then register new script URL]
-    expected: TIMEOUT
-

testing/web-platform/mozilla/tests/service-workers/service-worker/register-same-scope-different-script-url.https.html

@@ -84,10 +84,17 @@ async_test(function(t) {
       .then(function() {
           assert_equals(registration.installing, null,
                         'on installed, installing should be null');
-          assert_equals(registration.waiting.scriptURL, script2,
-                        'on installed, the second script should be waiting');
-          assert_equals(registration.active.scriptURL, script1,
-                        'on installed, the first script should be active');
+          // Since the registration is not controlling any document, the new
+          // worker can immediately transition to active.
+          if (registration.waiting) {
+            assert_equals(registration.waiting.scriptURL, script2,
+                          'on installed, the second script may still be waiting');
+            assert_equals(registration.active.scriptURL, script1,
+                          'on installed, the first script may be active');
+          } else {
+            assert_equals(registration.active.scriptURL, script2,
+                          'on installed, the second script may be active');
+          }
           return registration.unregister();
         })
       .then(function() {