Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(481)

Unified Diff: extensions/test/data/web_view/media_access/deny/embedder.js

Issue 626093002: Cleanup webview app_shell_browsertests and add webview media permission tests in app_shell_browsert… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tests_load
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..2595e7319b948be2d521fb514497bfeee6ac69c8 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,19 @@
var embedder = {};
embedder.tests = {};
+// These variables will be filled in chrome.test.getConfig() below.
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 +194,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 +207,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');
});
};

Powered by Google App Engine
This is Rietveld 408576698