Disallow NaCl in chrome webstore for ARM

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 587 matching lines @@
   // code when PNaCl ships.
   bool is_whitelisted_url =
       ((top_url.SchemeIs("http") || top_url.SchemeIs("https")) &&
       (top_url.host() == "plus.google.com" ||
           top_url.host() == "plus.sandbox.google.com") &&
       top_url.path().find("/games") == 0);
 
   // 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
         (is_extension_from_webstore &&
         manifest_url.SchemeIs("chrome-extension") &&
         manifest_url.host() == "acadkphlmlegjaadjagenfimbpphcgnh");
     // Make sure that PPAPI 'dev' interfaces aren't available for production
     // apps unless they're whitelisted.
     WebString dev_attribute = WebString::fromUTF8("@dev");
     if ((!is_whitelisted_url && !is_extension_from_webstore) ||
@@ skipping 329 matching lines @@
 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
   return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
 }
 
 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
     webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
   factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
 }
 
 }  // namespace chrome