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

chrome/renderer/chrome_content_renderer_client.h

Index: chrome/renderer/chrome_content_renderer_client.h
===================================================================
--- chrome/renderer/chrome_content_renderer_client.h	(revision 122697)
+++ chrome/renderer/chrome_content_renderer_client.h	(working copy)
@@ -133,6 +133,8 @@
       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,
@@ -141,14 +143,14 @@
                                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_;