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

Unified Diff: chrome/renderer/chrome_content_renderer_client_unittest.cc

Issue 10910004: Disable ChromeContentRendererClientTest.NaClRestriction on ARM. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Nice short URLs Created 8 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/chrome_content_renderer_client.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client_unittest.cc
diff --git a/chrome/renderer/chrome_content_renderer_client_unittest.cc b/chrome/renderer/chrome_content_renderer_client_unittest.cc
index 3283b3957c703a605aa6b90f62c6992564d39b12..845363fa3b8182e91918b848665204aa318a0143 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) {
&params));
}
}
+#endif // !defined(__arm__)
} // namespace chrome
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698