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

Unified Diff: chrome/test/data/nacl/pnacl_mime_type/pnacl_mime_type.html

Issue 19079002: Enable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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: chrome/test/data/nacl/pnacl_mime_type/pnacl_mime_type.html
diff --git a/chrome/test/data/nacl/pnacl_mime_type/pnacl_mime_type.html b/chrome/test/data/nacl/pnacl_mime_type/pnacl_mime_type.html
index cc648303ba24e97adc1926c76516ba36ce424212..0f7356bb9613e4b510c19f344ca582a40cb5028c 100644
--- a/chrome/test/data/nacl/pnacl_mime_type/pnacl_mime_type.html
+++ b/chrome/test/data/nacl/pnacl_mime_type/pnacl_mime_type.html
@@ -21,27 +21,21 @@ function report(msg) {
domAutomationController.send(JSON.stringify(msg));
}
-var is_pnacl = (getTestArguments()["pnacl"] !== undefined);
+var pnacl_disabled = (getTestArguments()["pnacl_disabled"] !== undefined);
var tests = 0;
var errors = 0;
var pnacl_mime_type = "application/x-pnacl";
-if (is_pnacl && (navigator.mimeTypes[pnacl_mime_type] == undefined)) {
+if (!pnacl_disabled && (navigator.mimeTypes[pnacl_mime_type] == undefined)) {
report({type: "Log", message: "Error: could not find " + pnacl_mime_type});
errors++;
-} else if (!is_pnacl && (navigator.mimeTypes[pnacl_mime_type] !== undefined)) {
+} else if (pnacl_disabled &&
+ (navigator.mimeTypes[pnacl_mime_type] !== undefined)) {
Mark Seaborn 2013/07/18 01:25:52 Indent to line up with '('
sehr 2013/07/22 23:06:50 Done.
report({type: "Log", message: "Error: unexpected " + pnacl_mime_type});
errors++;
}
tests++;
-var nacl_mime_type = "application/x-nacl";
Mark Seaborn 2013/07/18 01:25:52 I'm not sure why you're removing this. This needs
sehr 2013/07/22 23:06:50 I can't remember either, and the test passes with
-if (navigator.mimeTypes[nacl_mime_type] == undefined) {
- report({type: "Log", message: "Error: could not find " + nacl_mime_type});
- errors++;
-}
-tests++;
-
if (errors == 0) {
report({type: "Shutdown", message: "" + tests + " tests passed.",
passed: true});

Powered by Google App Engine
This is Rietveld 408576698