| Index: extensions/test/data/web_view/media_access/deny/embedder.js
|
| diff --git a/chrome/test/data/extensions/platform_apps/web_view/media_access/deny/embedder.js b/extensions/test/data/web_view/media_access/deny/embedder.js
|
| similarity index 94%
|
| copy from chrome/test/data/extensions/platform_apps/web_view/media_access/deny/embedder.js
|
| copy to extensions/test/data/web_view/media_access/deny/embedder.js
|
| index 988de627a0fd6bdb85be86c558627b8b2be967be..a3da630fdbda0fe7cd525cf56c3f02723151201e 100644
|
| --- a/chrome/test/data/extensions/platform_apps/web_view/media_access/deny/embedder.js
|
| +++ b/extensions/test/data/web_view/media_access/deny/embedder.js
|
| @@ -4,18 +4,16 @@
|
|
|
| var embedder = {};
|
| embedder.tests = {};
|
| -embedder.baseGuestURL = '';
|
| -embedder.guestURL = '';
|
|
|
| embedder.passTest = function() {
|
| - chrome.test.sendMessage('PASSED');
|
| + chrome.test.sendMessage('TEST_PASSED');
|
| };
|
|
|
| embedder.failTest = function(opt_msg) {
|
| if (opt_msg) {
|
| - window.console.log(opt_msg);
|
| + window.console.warn(opt_msg);
|
| }
|
| - chrome.test.sendMessage('FAILED');
|
| + chrome.test.sendMessage('TEST_FAILED');
|
| };
|
|
|
| embedder.assertTrue = function(condition, msg) {
|
| @@ -193,7 +191,7 @@ embedder.testNamesToTestMap = {
|
| embedder.tests.testNoPreventDefaultImpliesDeny
|
| };
|
|
|
| -window['startDenyTest'] = function(testName) {
|
| +function runTest(testName) {
|
| var testFunction = embedder.testNamesToTestMap[testName];
|
| if (!testFunction) {
|
| embedder.failTest('No such test: ' + testName);
|
| @@ -206,10 +204,8 @@ window['startDenyTest'] = function(testName) {
|
| onload = function() {
|
| chrome.test.getConfig(function(config) {
|
| embedder.baseGuestURL = 'http://localhost:' + config.testServer.port;
|
| - embedder.guestURL = embedder.baseGuestURL +
|
| - '/extensions/platform_apps/web_view/media_access' +
|
| - '/media_access_guest.html';
|
| + embedder.guestURL = embedder.baseGuestURL + '/media_access_guest.html';
|
| chrome.test.log('Guest url is: ' + embedder.guestURL);
|
| - chrome.test.sendMessage('loaded');
|
| + chrome.test.sendMessage('LAUNCHED');
|
| });
|
| };
|
|
|