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

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

Issue 22839005: disable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review changes Created 7 years, 4 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/renderer/pepper/ppb_nacl_private_impl.cc ('k') | chrome/test/nacl/nacl_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a96ad0b79fabc602433f51471ba5939219438550..cc648303ba24e97adc1926c76516ba36ce424212 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,16 +21,15 @@ function report(msg) {
domAutomationController.send(JSON.stringify(msg));
}
-var pnacl_disabled = (getTestArguments()["pnacl_disabled"] !== undefined);
+var is_pnacl = (getTestArguments()["pnacl"] !== undefined);
var tests = 0;
var errors = 0;
var pnacl_mime_type = "application/x-pnacl";
-if (!pnacl_disabled && (navigator.mimeTypes[pnacl_mime_type] == undefined)) {
+if (is_pnacl && (navigator.mimeTypes[pnacl_mime_type] == undefined)) {
report({type: "Log", message: "Error: could not find " + pnacl_mime_type});
errors++;
-} else if (pnacl_disabled &&
- (navigator.mimeTypes[pnacl_mime_type] !== undefined)) {
+} else if (!is_pnacl && (navigator.mimeTypes[pnacl_mime_type] !== undefined)) {
report({type: "Log", message: "Error: unexpected " + pnacl_mime_type});
errors++;
}
« no previous file with comments | « chrome/renderer/pepper/ppb_nacl_private_impl.cc ('k') | chrome/test/nacl/nacl_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698