Index: chrome/test/data/nacl/nameservice/pm_nameservice_test.html |
diff --git a/ppapi/native_client/tests/nacl_browser/nameservice/pm_nameservice_test.html b/chrome/test/data/nacl/nameservice/pm_nameservice_test.html |
similarity index 85% |
rename from ppapi/native_client/tests/nacl_browser/nameservice/pm_nameservice_test.html |
rename to chrome/test/data/nacl/nameservice/pm_nameservice_test.html |
index 3d376ab26d8eac065b95f456b0e0f53df58cdda2..c12fc53ab15a2990d50b4917516f9bdb6a84f2e4 100644 |
--- a/ppapi/native_client/tests/nacl_browser/nameservice/pm_nameservice_test.html |
+++ b/chrome/test/data/nacl/nameservice/pm_nameservice_test.html |
@@ -15,19 +15,27 @@ |
<body> |
<h1>Native Client Post Message Name Service Test</h1> |
- <div> |
- <embed id="naclModule" |
- name="naclModule" |
- width=400 height=400 |
- src="pm_nameservice_test.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_nameservice_test.nmf', mime); |
+embed.basic_tests ='2'; |
+embed.stress_tests = '0'; |
+document.body.appendChild(embed); |
+ |
function setupTests(tester, plugin) { |
tester.addAsyncTest('TestInit', function(status) { |
plugin.addEventListener('message', function(message_event) { |