Chromium Code Reviews| Index: chrome/test/data/extensions/platform_apps/web_view/newwindow/embedder.js |
| diff --git a/chrome/test/data/extensions/platform_apps/web_view/newwindow/embedder.js b/chrome/test/data/extensions/platform_apps/web_view/newwindow/embedder.js |
| index 424290e612d8978ffe118950786aacc8f5478d95..876b22d3aa14c573c30007a0ebf0906a4eb74e7b 100644 |
| --- a/chrome/test/data/extensions/platform_apps/web_view/newwindow/embedder.js |
| +++ b/chrome/test/data/extensions/platform_apps/web_view/newwindow/embedder.js |
| @@ -16,10 +16,11 @@ embedder.setUp = function(config) { |
| }; |
| /** @private */ |
| -embedder.setUpGuest_ = function() { |
| +embedder.setUpGuest_ = function(partitionName) { |
| document.querySelector('#webview-tag-container').innerHTML = |
| '<webview style="width: 100px; height: 100px;"' + |
| ' src="' + embedder.guestURL + '"' + |
| + ' partition="' + partitionName + '"' + |
|
lazyboy
2013/03/25 18:12:55
Also keeping a test that doesn't have any partitio
Fady Samuel
2013/03/25 19:28:20
Done.
|
| '></webview>'; |
| var webview = document.querySelector('webview'); |
| if (!webview) { |
| @@ -48,7 +49,8 @@ embedder.setUpFrameNameRequest_ = function(webview, testName) { |
| }; |
| /** @private */ |
| -embedder.requestFrameName_ = function(webview, testName, expectedFrameName) { |
| +embedder.requestFrameName_ = |
| + function(webview, openerwebview, testName, expectedFrameName) { |
| var onPostMessageReceived = function(e) { |
| var data = JSON.parse(e.data); |
| if (data[0] == 'get-frame-name') { |
| @@ -58,6 +60,7 @@ embedder.requestFrameName_ = function(webview, testName, expectedFrameName) { |
| var frameName = data[2]; |
| chrome.test.assertEq(expectedFrameName, frameName); |
| chrome.test.assertEq(expectedFrameName, webview.name); |
| + chrome.test.assertEq(openerwebview.partition, webview.partition); |
| chrome.test.succeed(); |
| } |
| }; |
| @@ -78,7 +81,7 @@ embedder.assertCorrectEvent_ = function(e) { |
| var testNewWindow = |
| function(testName, webViewName, guestName, expectedFrameName) { |
| - var webview = embedder.setUpGuest_(); |
| + var webview = embedder.setUpGuest_('persist:partname'); |
| var onNewWindow = function(e) { |
| chrome.test.log('Embedder notified on newwindow'); |
| @@ -97,7 +100,8 @@ var testNewWindow = |
| var newwebview = w.document.querySelector('webview'); |
| newwebview.name = webViewName; |
| embedder.setUpFrameNameRequest_(newwebview, testName); |
| - embedder.requestFrameName_(newwebview, testName, expectedFrameName); |
| + embedder.requestFrameName_( |
| + newwebview, webview, testName, expectedFrameName); |
| try { |
| e.window.attach(newwebview); |
| } catch (e) { |