diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/data/nacl/bad/ppapi_bad.html | 18 | ||||
| -rw-r--r-- | chrome/test/nacl/nacl_browsertest.cc | 4 |
2 files changed, 1 insertions, 21 deletions
diff --git a/chrome/test/data/nacl/bad/ppapi_bad.html b/chrome/test/data/nacl/bad/ppapi_bad.html index 4cb4285..01a3e6a 100644 --- a/chrome/test/data/nacl/bad/ppapi_bad.html +++ b/chrome/test/data/nacl/bad/ppapi_bad.html @@ -197,24 +197,6 @@ function runTests() { <!-- The tests will create and remove embeds from this div. --> <div id="embeds"></div> -<!-- These two embeds are not automatically tested - visual inspection only. --> - -<embed id="cross_manifest_pdf" - width=100 height=20 - src="http://www.google.com/crossorigin.manifest" - style="background-color:gray" - type="application/pdf" /> - -<!-- This load would have succeeded if the NEXE was from a chrome-extension - URL and NaCl had been registered as handling the PDF MIME type using - the nacl_modules attribute in a Chrome extension manifest. --> - -<embed id="cross_origin_pdf" - width=100 height=20 - src="ppapi_bad_crossorigin.nmf" - style="background-color:gray" - type="application/pdf" /> - <script type="text/javascript"> //<![CDATA[ runTests(); diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc index cfbe37c6..377640d 100644 --- a/chrome/test/nacl/nacl_browsertest.cc +++ b/chrome/test/nacl/nacl_browsertest.cc @@ -87,9 +87,7 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, ProgressEvents, { // allowed. Also not run on GLibc because it's a large test that is at risk of // causing timeouts. // crbug/338444 -// crbug.com/375103: fails on Mac after open sourcing PDF plugin. -// crbug.com/375103: fails on Linux too after open sourcing PDF plugin. -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) #define MAYBE_Bad DISABLED_Bad #else #define MAYBE_Bad Bad |