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

Unified Diff: chrome/test/data/extensions/platform_apps/web_view/media_access/allow/embedder.js

Issue 15741014: Fix WebViewTest.MediaAccessAPIAllow* flakiness/timeout on chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ready for review. Created 7 years, 7 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
« no previous file with comments | « chrome/browser/extensions/web_view_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/extensions/platform_apps/web_view/media_access/allow/embedder.js
diff --git a/chrome/test/data/extensions/platform_apps/web_view/media_access/allow/embedder.js b/chrome/test/data/extensions/platform_apps/web_view/media_access/allow/embedder.js
index 1f413945f9740d3e847931552de60670af06de00..1c4f24cad079d38e707efe7e39344115b30c29e8 100644
--- a/chrome/test/data/extensions/platform_apps/web_view/media_access/allow/embedder.js
+++ b/chrome/test/data/extensions/platform_apps/web_view/media_access/allow/embedder.js
@@ -7,29 +7,18 @@ embedder.tests = {};
embedder.baseGuestURL = '';
embedder.guestURL = '';
-embedder.testStatus = '';
-
// Sends a message to WebViewTest denoting it is done and test
// has failed.
embedder.failTest = function(msg) {
- embedder.testStatus = 'FAILED';
- chrome.test.log('test failure, reason: ' + msg);
- chrome.test.sendMessage('DoneMediaTest');
+ window.console.log('test failure, reason: ' + msg);
+ chrome.test.sendMessage('DoneMediaTest.FAILED');
};
// Sends a message to WebViewTest denoting it is done and test
-// has succeeded, iff the test has not already failed.
+// has succeeded.
embedder.maybePassTest = function() {
- if (embedder.testStatus != 'FAILED') {
- embedder.testStatus = 'PASSED';
- }
- chrome.test.sendMessage('DoneMediaTest');
-};
-
-// Called by browser_tests to query test state.
-function getTestStatus() {
- chrome.test.log('getTestStatus called: status = ' + embedder.testStatus);
- return embedder.testStatus;
+ window.console.log('test passed');
+ chrome.test.sendMessage('DoneMediaTest.PASSED');
};
/** @private */
@@ -235,7 +224,6 @@ function startAllowTest(testName) {
embedder.failTest('No such test: ' + testName);
return;
}
- embedder.testStatus = '';
testFunction();
});
}
« no previous file with comments | « chrome/browser/extensions/web_view_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698