Allow NaCl plugin to be loaded from hosted app URLs.

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 528 matching lines @@
           const Extension* extension =
               extension_dispatcher_->extensions()->GetExtensionOrAppByURL(
                   ExtensionURLInfo(manifest_url));
           bool is_extension_from_webstore =
               extension && extension->from_webstore();
           // Allow built-in extensions and extensions under development.
           bool is_extension_unrestricted = extension &&
               (extension->location() == extensions::Manifest::COMPONENT ||
                extensions::Manifest::IsUnpackedLocation(extension->location()));
           GURL top_url = frame->top()->document().url();
-          if (!IsNaClAllowed(manifest_url,
+          bool is_invoked_by_hosted_app = extension &&
+              extension->is_hosted_app() &&
+              extension->web_extent().MatchesURL(top_url);
+          if (!is_invoked_by_hosted_app &&

[Matt Perry, 2013/03/12 22:23:22]

I would pass |extension| as a parameter to IsNaclAllowed and move the
is_invoked_by_hosted_app check in there.

+              !IsNaClAllowed(manifest_url,
                              top_url,
                              is_nacl_unrestricted,
                              is_extension_unrestricted,
                              is_extension_from_webstore,
                              &params)) {
             frame->addMessageToConsole(
                 WebConsoleMessage(
                     WebConsoleMessage::LevelError,
                     "Only unpacked extensions and apps installed from the "
                     "Chrome Web Store can load NaCl modules without enabling "
@@ skipping 562 matching lines @@
   if (container->element().shadowHost().tagName().equals(
           WebKit::WebString::fromUTF8(kWebViewTagName))) {
     return true;
   } else {
     return CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableBrowserPluginForAllViewTypes);
   }
 }
 
 }  // namespace chrome