| OLD | NEW |
| 1 <script> | 1 <script> |
| 2 var URL = chrome.extension.getURL("getFrame/a.html"); | 2 var URL = chrome.extension.getURL("getFrame/a.html"); |
| 3 var tabId = -1; | 3 var tabId = -1; |
| 4 var processId = -1; |
| 4 | 5 |
| 5 chrome.test.runTests([ | 6 chrome.test.runTests([ |
| 6 function testGetFrame() { | 7 function testGetFrame() { |
| 7 chrome.tabs.create({"url": "about:blank"}, function(tab) { | 8 chrome.tabs.create({"url": "about:blank"}, function(tab) { |
| 8 tabId = tab.id; | 9 tabId = tab.id; |
| 9 var done = chrome.test.listenForever( | 10 var done = chrome.test.listenForever( |
| 10 chrome.webNavigation.onBeforeNavigate, | 11 chrome.webNavigation.onBeforeNavigate, |
| 11 function (details) { | 12 function (details) { |
| 12 if (details.tabId != tabId) | 13 if (details.tabId != tabId) |
| 13 return; | 14 return; |
| 14 if (details.url != URL) | 15 if (details.url != URL) |
| 15 return; | 16 return; |
| 17 processId = details.processId; |
| 16 chrome.webNavigation.getFrame( | 18 chrome.webNavigation.getFrame( |
| 17 {tabId: tabId, frameId: 0}, | 19 {tabId: tabId, frameId: 0, processId: processId}, |
| 18 function(details) { | 20 function(details) { |
| 19 chrome.test.assertEq({errorOccurred: false, url: URL}, | 21 chrome.test.assertEq({errorOccurred: false, url: URL}, |
| 20 details); | 22 details); |
| 21 done(); | 23 done(); |
| 22 }); | 24 }); |
| 23 }); | 25 }); |
| 24 chrome.tabs.update(tabId, {url: URL}); | 26 chrome.tabs.update(tabId, {url: URL}); |
| 25 }); | 27 }); |
| 26 }, | 28 }, |
| 27 | 29 |
| 28 function testGetInvalidFrame() { | 30 function testGetInvalidFrame() { |
| 29 chrome.webNavigation.getFrame( | 31 chrome.webNavigation.getFrame( |
| 30 {tabId: tabId, frameId: 1}, | 32 {tabId: tabId, frameId: 1, processId: processId}, |
| 31 function (details) { | 33 function (details) { |
| 32 chrome.test.assertEq(null, details); | 34 chrome.test.assertEq(null, details); |
| 33 chrome.test.succeed(); | 35 chrome.test.succeed(); |
| 34 }); | 36 }); |
| 35 }, | 37 }, |
| 36 | 38 |
| 37 function testGetAllFrames() { | 39 function testGetAllFrames() { |
| 38 chrome.webNavigation.getAllFrames( | 40 chrome.webNavigation.getAllFrames( |
| 39 {tabId: tabId}, | 41 {tabId: tabId}, |
| 40 function (details) { | 42 function (details) { |
| 41 chrome.test.assertEq([{errorOccurred: false, frameId: 0, url: URL}], | 43 chrome.test.assertEq( |
| 42 details); | 44 [{errorOccurred: false, |
| 45 frameId: 0, |
| 46 processId: processId, |
| 47 url: URL}], |
| 48 details); |
| 43 chrome.test.succeed(); | 49 chrome.test.succeed(); |
| 44 }); | 50 }); |
| 45 } | 51 } |
| 46 ]); | 52 ]); |
| 47 </script> | 53 </script> |
| OLD | NEW |