| Index: extensions/test/data/web_view/media_access/check/embedder.js
|
| diff --git a/chrome/test/data/extensions/platform_apps/web_view/media_access/check/embedder.js b/extensions/test/data/web_view/media_access/check/embedder.js
|
| similarity index 91%
|
| copy from chrome/test/data/extensions/platform_apps/web_view/media_access/check/embedder.js
|
| copy to extensions/test/data/web_view/media_access/check/embedder.js
|
| index aea1c2157122bb80ab1760682cf5fdf5c95b76c4..18549786cb26808758efcadf8835b195fc5d9067 100644
|
| --- a/chrome/test/data/extensions/platform_apps/web_view/media_access/check/embedder.js
|
| +++ b/extensions/test/data/web_view/media_access/check/embedder.js
|
| @@ -4,6 +4,7 @@
|
|
|
| var embedder = {};
|
| embedder.tests = {};
|
| +// These variables will be filled in chrome.test.getConfig() below.
|
| embedder.baseGuestURL = '';
|
| embedder.guestURL = '';
|
|
|
| @@ -17,7 +18,6 @@ embedder.failTest = function(msg) {
|
| // Sends a message to WebViewTest denoting it is done and test
|
| // has succeeded.
|
| embedder.maybePassTest = function() {
|
| - window.console.log('test passed');
|
| chrome.test.sendMessage('TEST_PASSED');
|
| };
|
|
|
| @@ -58,12 +58,10 @@ embedder.setUpLoadStop_ = function(webview) {
|
| // media access check and not actually do a check.
|
|
|
| // Entry point for test, called by WebViewTest.
|
| -function startCheckTest(testName) {
|
| +function runTest(testName) {
|
| chrome.test.getConfig(function(config) {
|
| embedder.baseGuestURL = 'http://localhost:' + config.testServer.port;
|
| - embedder.guestURL = embedder.baseGuestURL +
|
| - '/extensions/platform_apps/web_view/media_access' +
|
| - '/media_check_guest.html';
|
| + embedder.guestURL = embedder.baseGuestURL + '/media_check_guest.html';
|
| chrome.test.log('Guest url is: ' + embedder.guestURL);
|
|
|
| var webview = embedder.setUpGuest_();
|
| @@ -89,5 +87,5 @@ function startCheckTest(testName) {
|
| }
|
|
|
| onload = function() {
|
| - chrome.test.sendMessage('Launched');
|
| + chrome.test.sendMessage('LAUNCHED');
|
| };
|
|
|