Index: chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc |
diff --git a/chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc |
index 96f02f6f98c53cf85b46f2734f7e301255839768..6853ee5a4ab14370723390d3eb4d53fa08d73900 100644 |
--- a/chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc |
+++ b/chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc |
@@ -120,10 +120,10 @@ int32_t PepperCrxFileSystemMessageFilter::OnOpenFileSystem( |
extension_set = extensions::ExtensionSystem::Get(profile)-> |
extension_service()->extensions(); |
} |
- if (!IsExtensionOrSharedModuleWhitelisted(document_url_, |
- extension_set, |
- allowed_crxfs_origins_, |
- switches::kAllowNaClCrxFsAPI)) { |
+ if (!IsExtensionOrSharedModuleWhitelisted( |
+ document_url_, extension_set, allowed_crxfs_origins_) && |
+ !IsHostAllowedByCommandLine( |
+ document_url_, extension_set, switches::kAllowNaClCrxFsAPI)) { |
LOG(ERROR) << "Host " << document_url_.host() << " cannot use CrxFs API."; |
return PP_ERROR_NOACCESS; |
} |