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

Unified Diff: chrome/test/data/nacl/manifest_file/pm_pre_init_manifest_file_test.html

Issue 133033002: Port manifest query tests from nacl_integration to browser_tests. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 6 years, 11 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/manifest_file/pm_pre_init_manifest_file_test.html
diff --git a/ppapi/native_client/tests/nacl_browser/manifest_file/pm_pre_init_manifest_file_test.html b/chrome/test/data/nacl/manifest_file/pm_pre_init_manifest_file_test.html
similarity index 84%
rename from ppapi/native_client/tests/nacl_browser/manifest_file/pm_pre_init_manifest_file_test.html
rename to chrome/test/data/nacl/manifest_file/pm_pre_init_manifest_file_test.html
index 1e24e032b6b845d26e680b0d51aabf0dee671a89..f53354d7d4469c1089751ed71ce9babad7882cbb 100644
--- a/ppapi/native_client/tests/nacl_browser/manifest_file/pm_pre_init_manifest_file_test.html
+++ b/chrome/test/data/nacl/manifest_file/pm_pre_init_manifest_file_test.html
@@ -15,19 +15,27 @@
<body>
<h1>Native Client Pre-Init Post Message Manifest File Test</h1>
- <div>
- <embed id="naclModule"
- name="naclModule"
- width=400 height=400
- src="pm_pre_init_manifest_file.nmf"
- basic_tests="2"
- stress_tests="0"
- style="background-color:gray"
- type="application/x-nacl" />
- </div>
<script type="text/javascript">
//<![CDATA[
+function createModule(id, src, type) {
+ return createNaClEmbed({
+ id: id,
+ src: src,
+ width: 400,
+ height: 400,
+ type: type
+ });
+}
+var mime = 'application/x-nacl';
+if (getTestArguments()['pnacl'] !== undefined) {
+ mime = 'application/x-pnacl';
+}
+var embed = createModule('naclModule', 'pm_pre_init_manifest_file.nmf', mime);
+embed.basic_tests ='2';
+embed.stress_tests = '0';
+document.body.appendChild(embed);
+
function setupTests(tester, plugin) {
tester.addAsyncTest('Test_00_ManifestData', function(status) {
plugin.addEventListener('message', function(message_event) {

Powered by Google App Engine
This is Rietveld 408576698