| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <html> | 2 <html> |
| 3 <title>Service Worker: Memory Cache</title> | 3 <title>Service Worker: Memory Cache</title> |
| 4 <script src="../../resources/testharness.js"></script> | 4 <script src="../../resources/testharness.js"></script> |
| 5 <script src="../../resources/testharnessreport.js"></script> | 5 <script src="../../resources/testharnessreport.js"></script> |
| 6 <script src="../resources/test-helpers.js"></script> | 6 <script src="../resources/test-helpers.js"></script> |
| 7 <script> | 7 <script> |
| 8 var callback; | 8 var callback; |
| 9 | 9 |
| 10 function getJSONP(url) { | 10 function getJSONP(url) { |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 var scope = 'resources/memory-cache-controlled.html'; | 21 var scope = 'resources/memory-cache-controlled.html'; |
| 22 var worker = 'resources/memory-cache-worker.js'; | 22 var worker = 'resources/memory-cache-worker.js'; |
| 23 var json_url = '/serviceworker/chromium/resources/memory-cache.jsonp'; | 23 var json_url = '/serviceworker/chromium/resources/memory-cache.jsonp'; |
| 24 var registration; | 24 var registration; |
| 25 var frame; | 25 var frame; |
| 26 var promises = []; | 26 var promises = []; |
| 27 | 27 |
| 28 service_worker_unregister_and_register(t, worker, scope) | 28 service_worker_unregister_and_register(t, worker, scope) |
| 29 .then(function(r) { | 29 .then(function(r) { |
| 30 registration = r; | 30 registration = r; |
| 31 return wait_for_activated(t, registration); | 31 return wait_for_state(t, r.installing, 'activated'); |
| 32 }) | 32 }) |
| 33 .then(function() { return with_iframe(scope); }) | 33 .then(function() { return with_iframe(scope); }) |
| 34 .then(function(f) { | 34 .then(function(f) { |
| 35 frame = f; | 35 frame = f; |
| 36 | 36 |
| 37 // Request a json file from controlled page. | 37 // Request a json file from controlled page. |
| 38 assert_false( | 38 assert_false( |
| 39 frame.contentWindow.internals.isLoadingFromMemoryCache(json_url), | 39 frame.contentWindow.internals.isLoadingFromMemoryCache(json_url), |
| 40 'Cache for controlled page should be empty'); | 40 'Cache for controlled page should be empty'); |
| 41 promises.push(frame.contentWindow.getJSONP(json_url)); | 41 promises.push(frame.contentWindow.getJSONP(json_url)); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 65 'Response for non-controlled page should be cached'); | 65 'Response for non-controlled page should be cached'); |
| 66 unload_iframe(frame); | 66 unload_iframe(frame); |
| 67 return registration.unregister(); | 67 return registration.unregister(); |
| 68 }) | 68 }) |
| 69 .then(function() { | 69 .then(function() { |
| 70 t.done(); | 70 t.done(); |
| 71 }) | 71 }) |
| 72 .catch(unreached_rejection(t)); | 72 .catch(unreached_rejection(t)); |
| 73 }, 'Non-controlled page should not use a cache filled by Service Worker'); | 73 }, 'Non-controlled page should not use a cache filled by Service Worker'); |
| 74 </script> | 74 </script> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 790683002:
ServiceWorker cleanup: remove wait_for_activated(); just use wait_for_state() (Closed)
Base URL: svn://svn.chromium.org/blink/trunk