diff options
| author | husky@chromium.org <husky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-30 21:48:55 +0000 |
|---|---|---|
| committer | husky@chromium.org <husky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-30 21:48:55 +0000 |
| commit | 2d86aea4a8086ea6c8023c087195a442d7e3e52b (patch) | |
| tree | 54aae222e72c82dd474004fb7d1ab27aa0fd935a /chrome/renderer/chrome_content_renderer_client_unittest.cc | |
| parent | 4ca1863011bba283f62afb0317999d5d0fa964a2 (diff) | |
| download | chromium_src-2d86aea4a8086ea6c8023c087195a442d7e3e52b.zip chromium_src-2d86aea4a8086ea6c8023c087195a442d7e3e52b.tar.gz chromium_src-2d86aea4a8086ea6c8023c087195a442d7e3e52b.tar.bz2 | |
Disable ChromeContentRendererClientTest.NaClRestriction on ARM.
This tests the NaCl content-type rules, which were modified for ARM
only in patch 154043 (https://chromiumcodereview.appspot.com/10898034).
As this is a temporary change with TODO(dschuff), I've just disabled
the whole test with the same TODO.
R=dschuff@chromium.org,thakis@chromium.org,sehr@chromium.org
BUG=145694
Review URL: https://chromiumcodereview.appspot.com/10910004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/chrome_content_renderer_client_unittest.cc')
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client_unittest.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client_unittest.cc b/chrome/renderer/chrome_content_renderer_client_unittest.cc index 3283b39..845363f 100644 --- a/chrome/renderer/chrome_content_renderer_client_unittest.cc +++ b/chrome/renderer/chrome_content_renderer_client_unittest.cc @@ -62,6 +62,12 @@ void AddContentTypeHandler(WebPluginInfo* info, typedef testing::Test ChromeContentRendererClientTest; +#if !defined(__arm__) +// The ARM ABI is not quite stable, so we only allow NaCl for +// unrestricted extensions (i.e. built-in and under development). +// Disable this whole test for ARM; other ABIs give us content-type coverage. +// See http://crbug.com/145694 +// TODO(dschuff): remove this when the ARM ABI is stable TEST_F(ChromeContentRendererClientTest, NaClRestriction) { // Unknown content types have no NaCl module. { @@ -196,6 +202,7 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) { ¶ms)); } } +#endif // !defined(__arm__) } // namespace chrome |