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__

[jvoung (off chromium), 2012/08/29 16:49:33]

nit: not sure if the if-defs are usually ARCH_CPU_ARM_FAMILY or __arm__ in
chrome code (lot of third_party uses __arm__, while base/ uses the other...)

[Derek Schuff, 2012/08/29 17:00:25]

Yeah, I wasn't sure either. I found both sprinkled in various places throughout
the chrome code (and both in content/ and chrome/), but more uses of __arm__ so
I went with that.
On 2012/08/29 16:49:33, jvoung (chromium) wrote:

+  // Since the ARM ABI is not quite stable, do not allow webstore extensions
+  // to use it yet. TODO(dschuff): remove this when the ABI is stable
+  bool is_nacl_allowed = is_extension_unrestricted || is_nacl_unrestricted;

[jvoung (off chromium), 2012/08/29 16:49:33]

Just to confirm, some of the apps we are interested in testing are
Component/Load ones, and don't require other whitelisting?

[Derek Schuff, 2012/08/29 17:00:25]

Right. If you look directly above the only whitelisted URLs are
plus.google.com/games. So unless I hear specifically about them, they will be
blocked.
On 2012/08/29 16:49:33, jvoung (chromium) wrote:

+#else
   bool is_nacl_allowed =
       is_extension_from_webstore ||
       is_extension_unrestricted ||
       is_whitelisted_url ||
       is_nacl_unrestricted;
+#endif
   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