| OLD | NEW |
| 1 <script> | 1 <script> |
| 2 var expectedEventData; | 2 var expectedEventData; |
| 3 var capturedEventData; | 3 var capturedEventData; |
| 4 var nextFrameId; | 4 var nextFrameId; |
| 5 var frameIds; | 5 var frameIds; |
| 6 | 6 |
| 7 function expect(data) { | 7 function expect(data) { |
| 8 expectedEventData = data; | 8 expectedEventData = data; |
| 9 capturedEventData = []; | 9 capturedEventData = []; |
| 10 nextFrameId = 1; | 10 nextFrameId = 1; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 | 40 |
| 41 chrome.experimental.webNavigation.onCommitted.addListener(function(details) { | 41 chrome.experimental.webNavigation.onCommitted.addListener(function(details) { |
| 42 captureEvent("onCommitted", details); | 42 captureEvent("onCommitted", details); |
| 43 }); | 43 }); |
| 44 | 44 |
| 45 chrome.experimental.webNavigation.onDOMContentLoaded.addListener( | 45 chrome.experimental.webNavigation.onDOMContentLoaded.addListener( |
| 46 function(details) { | 46 function(details) { |
| 47 captureEvent("onDOMContentLoaded", details); | 47 captureEvent("onDOMContentLoaded", details); |
| 48 }); | 48 }); |
| 49 | 49 |
| 50 chrome.experimental.webNavigation.onCompleted.addListener( |
| 51 function(details) { |
| 52 captureEvent("onCompleted", details); |
| 53 }); |
| 54 |
| 50 chrome.experimental.webNavigation.onErrorOccurred.addListener( | 55 chrome.experimental.webNavigation.onErrorOccurred.addListener( |
| 51 function(details) { | 56 function(details) { |
| 52 captureEvent("onErrorOccurred", details); | 57 captureEvent("onErrorOccurred", details); |
| 53 }); | 58 }); |
| 54 | 59 |
| 55 var getURL = chrome.extension.getURL; | 60 var getURL = chrome.extension.getURL; |
| 56 chrome.tabs.getSelected(null, function(tab) { | 61 chrome.tabs.getSelected(null, function(tab) { |
| 57 var tabId = tab.id; | 62 var tabId = tab.id; |
| 58 | 63 |
| 59 chrome.test.runTests([ | 64 chrome.test.runTests([ |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 [ "onDOMContentLoaded", | 105 [ "onDOMContentLoaded", |
| 101 { frameId: 0, | 106 { frameId: 0, |
| 102 tabId: tabId, | 107 tabId: tabId, |
| 103 timeStamp: 0, | 108 timeStamp: 0, |
| 104 url: getURL('iframeFail/d.html') }], | 109 url: getURL('iframeFail/d.html') }], |
| 105 [ "onErrorOccurred", | 110 [ "onErrorOccurred", |
| 106 { error: "net::ERR_FILE_NOT_FOUND", | 111 { error: "net::ERR_FILE_NOT_FOUND", |
| 107 frameId: 1, | 112 frameId: 1, |
| 108 tabId: tabId, | 113 tabId: tabId, |
| 109 timeStamp: 0, | 114 timeStamp: 0, |
| 110 url: getURL('iframeFail/c.html') }]]); | 115 url: getURL('iframeFail/c.html') }], |
| 116 [ "onCompleted", |
| 117 { frameId: 0, |
| 118 tabId: tabId, |
| 119 timeStamp: 0, |
| 120 url: getURL('iframeFail/d.html') }]]); |
| 111 chrome.tabs.update(tabId, { url: getURL('iframeFail/d.html') }); | 121 chrome.tabs.update(tabId, { url: getURL('iframeFail/d.html') }); |
| 112 }, | 122 }, |
| 113 | 123 |
| 114 /* An iframe navigates to a non-existant page. */ | 124 /* An iframe navigates to a non-existant page. */ |
| 115 function nonExistantIframeNavigation() { | 125 function nonExistantIframeNavigation() { |
| 116 expect([ | 126 expect([ |
| 117 [ "onBeforeNavigate", | 127 [ "onBeforeNavigate", |
| 118 { frameId: 0, | 128 { frameId: 0, |
| 119 requestId: 0, | 129 requestId: 0, |
| 120 tabId: tabId, | 130 tabId: tabId, |
| (...skipping 22 matching lines...) Expand all Loading... |
| 143 tabId: tabId, | 153 tabId: tabId, |
| 144 timeStamp: 0, | 154 timeStamp: 0, |
| 145 transitionQualifiers: "", | 155 transitionQualifiers: "", |
| 146 transitionType: "auto_subframe", | 156 transitionType: "auto_subframe", |
| 147 url: getURL('iframeFail/b.html') }], | 157 url: getURL('iframeFail/b.html') }], |
| 148 [ "onDOMContentLoaded", | 158 [ "onDOMContentLoaded", |
| 149 { frameId: 1, | 159 { frameId: 1, |
| 150 tabId: tabId, | 160 tabId: tabId, |
| 151 timeStamp: 0, | 161 timeStamp: 0, |
| 152 url: getURL('iframeFail/b.html') }], | 162 url: getURL('iframeFail/b.html') }], |
| 163 [ "onCompleted", |
| 164 { frameId: 1, |
| 165 tabId: tabId, |
| 166 timeStamp: 0, |
| 167 url: getURL('iframeFail/b.html') }], |
| 168 [ "onCompleted", |
| 169 { frameId: 0, |
| 170 tabId: tabId, |
| 171 timeStamp: 0, |
| 172 url: getURL('iframeFail/a.html') }], |
| 153 [ "onBeforeNavigate", | 173 [ "onBeforeNavigate", |
| 154 { frameId: 1, | 174 { frameId: 1, |
| 155 requestId: 0, | 175 requestId: 0, |
| 156 tabId: tabId, | 176 tabId: tabId, |
| 157 timeStamp: 0, | 177 timeStamp: 0, |
| 158 url: getURL('iframeFail/c.html') }], | 178 url: getURL('iframeFail/c.html') }], |
| 159 [ "onErrorOccurred", | 179 [ "onErrorOccurred", |
| 160 { error: "net::ERR_FILE_NOT_FOUND", | 180 { error: "net::ERR_FILE_NOT_FOUND", |
| 161 frameId: 1, | 181 frameId: 1, |
| 162 tabId: tabId, | 182 tabId: tabId, |
| 163 timeStamp: 0, | 183 timeStamp: 0, |
| 164 url: getURL('iframeFail/c.html') }]]); | 184 url: getURL('iframeFail/c.html') }]]); |
| 165 chrome.tabs.update(tabId, { url: getURL('iframeFail/a.html') }); | 185 chrome.tabs.update(tabId, { url: getURL('iframeFail/a.html') }); |
| 166 }, | 186 }, |
| 167 ]); | 187 ]); |
| 168 }); | 188 }); |
| 169 </script> | 189 </script> |
| OLD | NEW |