Allow NaCl for non web store apps if their top level URL is whitelisted.

chrome/renderer/chrome_content_renderer_client.h

 // 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.
 
 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
 #pragma once
 
 #include <set>
 #include <string>
@@ skipping 117 matching lines @@
 
   WebKit::WebPlugin* CreatePlugin(
       content::RenderView* render_view,
       WebKit::WebFrame* frame,
       const WebKit::WebPluginParams& params,
       const ChromeViewHostMsg_GetPluginInfo_Status& status,
       const webkit::WebPluginInfo& plugin,
       const std::string& actual_mime_type);
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction);
+
   // Returns true if the frame is navigating to an URL either into or out of an
   // extension app's extent.
   bool CrossesExtensionExtents(WebKit::WebFrame* frame,
                                const GURL& new_url,
                                const ExtensionSet& extensions,
                                bool is_extension_url,
                                bool is_initial_navigation);
 
-  // Returns true if the NaCl plugin can be created. If it returns true, as a
-  // side effect, it may add special attributes to params.
-  bool IsNaClAllowed(const webkit::WebPluginInfo& plugin,
-                     const GURL& url,
-                     const std::string& actual_mime_type,
-                     bool is_nacl_mime_type,
-                     bool enable_nacl,
-                     WebKit::WebPluginParams& params);
+  static GURL GetNaClContentHandlerURL(const std::string& actual_mime_type,
+                                       const webkit::WebPluginInfo& plugin);
+  static bool IsNaClAllowed(const GURL& manifest_url,
+                            const GURL& top_url,
+                            bool is_nacl_unrestricted,
+                            bool is_extension_unrestricted,
+                            bool is_extension_from_webstore,
+                            WebKit::WebPluginParams& params);
 
   scoped_ptr<ChromeRenderProcessObserver> chrome_observer_;
   scoped_ptr<ExtensionDispatcher> extension_dispatcher_;
   scoped_ptr<RendererHistogramSnapshots> histogram_snapshots_;
   scoped_ptr<RendererNetPredictor> net_predictor_;
   scoped_ptr<SpellCheck> spellcheck_;
   scoped_ptr<VisitedLinkSlave> visited_link_slave_;
   scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_;
 
   // Set of origins that can use TCP/UDP private APIs from NaCl.
   std::set<std::string> allowed_socket_origins_;
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_