Flag and whitelist to allow crxfs api in NaCl

chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.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/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
 
 #include "chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h"
 #include "chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.h"
 #include "chrome/browser/renderer_host/pepper/pepper_extensions_common_message_filter.h"
 #include "chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h"
@@ skipping 52 matching lines @@
   if (host_->GetPpapiHost()->permissions().HasPermission(
           ppapi::PERMISSION_PRIVATE)) {
     switch (message.type()) {
       case PpapiHostMsg_Broker_Create::ID: {
         scoped_refptr<ResourceMessageFilter> broker_filter(
             new PepperBrokerMessageFilter(instance, host_));
         return scoped_ptr<ResourceHost>(new MessageFilterHost(
             host_->GetPpapiHost(), instance, params.pp_resource(),
             broker_filter));
       }
-      case PpapiHostMsg_Ext_CrxFileSystem_Create::ID: {
-        PepperCrxFileSystemMessageFilter* crxfs_filter =
-            PepperCrxFileSystemMessageFilter::Create(instance, host_);
-        if (!crxfs_filter)
-          return scoped_ptr<ResourceHost>();
-        return scoped_ptr<ResourceHost>(new MessageFilterHost(
-            host, instance, params.pp_resource(), crxfs_filter));
-      }
       case PpapiHostMsg_Talk_Create::ID:
         return scoped_ptr<ResourceHost>(new PepperTalkHost(
             host_, instance, params.pp_resource()));
     }
   }
 
   // Flash interfaces.
   if (host_->GetPpapiHost()->permissions().HasPermission(
           ppapi::PERMISSION_FLASH)) {
     switch (message.type()) {
       case PpapiHostMsg_Flash_Create::ID:
         return scoped_ptr<ResourceHost>(new PepperFlashBrowserHost(
             host_, instance, params.pp_resource()));
       case PpapiHostMsg_FlashClipboard_Create::ID: {
         scoped_refptr<ResourceMessageFilter> clipboard_filter(
             new PepperFlashClipboardMessageFilter);
         return scoped_ptr<ResourceHost>(new MessageFilterHost(
             host_->GetPpapiHost(), instance, params.pp_resource(),
             clipboard_filter));
       }
       case PpapiHostMsg_FlashDeviceID_Create::ID:
         return scoped_ptr<ResourceHost>(new PepperFlashDeviceIDHost(
             host_, instance, params.pp_resource()));
     }
   }
+
+  // Permissions for the following interfaces will be checked at the
+  // time of the corresponding instance's methods calls (because
+  // permission check can be performed only on the UI
+  // thread). Currently these interfaces are available only for
+  // whitelisted apps which may not have access to the other private
+  // interfaces.
+  if (message.type() == PpapiHostMsg_Ext_CrxFileSystem_Create::ID) {
+    PepperCrxFileSystemMessageFilter* crxfs_filter =
+        PepperCrxFileSystemMessageFilter::Create(instance, host_);
+    if (!crxfs_filter)
+      return scoped_ptr<ResourceHost>();
+    return scoped_ptr<ResourceHost>(new MessageFilterHost(
+        host, instance, params.pp_resource(), crxfs_filter));
+  }
+
   return scoped_ptr<ResourceHost>();
 }
 
 }  // namespace chrome