Disallow NaCl in chrome webstore for ARM

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 168a585aa14394aa6a8224d3795d4567f92bebda..53c707fe5996ba40f9b996a19b6a48bc47497493 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -605,11 +605,18 @@ bool ChromeContentRendererClient::IsNaClAllowed(
   // Allow Chrome Web Store extensions, built-in extensions, extensions
   // under development, invocations from whitelisted URLs, and all invocations
   // if --enable-nacl is set.
+#ifdef __arm__
+  // Since the ARM ABI is not quite stable, so only allow NaCl for
+  // unrestricted extensions (i.e. built-in and under development).
+  // TODO(dschuff): remove this when the ABI is stable
+  bool is_nacl_allowed = is_extension_unrestricted || is_nacl_unrestricted;
+#else
   bool is_nacl_allowed =
       is_extension_from_webstore ||
       is_extension_unrestricted ||
       is_whitelisted_url ||
       is_nacl_unrestricted;
+#endif

[Nico, 2012/08/29 17:08:15]

Can you write this as:

bool is_nacl_allowed =
#if !defined(__arm__)
    // The ARM ABI is not quite stable, so only allow NaCl for unr…
    is_extension_from_webstore ||
    is_whitelisted_url ||
#endif
    is_extension_unrestricted ||
    is_nacl_unrestricted;

[Derek Schuff, 2012/08/29 17:32:41]

Done.

   if (is_nacl_allowed) {
     bool app_can_use_dev_interfaces =
         // NaCl PDF viewer extension