Non-SFI NaCl: Batch-open resource files

components/nacl/browser/nacl_host_message_filter.cc

Index: components/nacl/browser/nacl_host_message_filter.cc
diff --git a/components/nacl/browser/nacl_host_message_filter.cc b/components/nacl/browser/nacl_host_message_filter.cc
index 60093eff3ffdfb2009e767c2c44a82063ca081cf..38f8e586de90aadef5ac5359cc87837e306d4a60 100644
--- a/components/nacl/browser/nacl_host_message_filter.cc
+++ b/components/nacl/browser/nacl_host_message_filter.cc
@@ -98,8 +98,8 @@ bool NaClHostMessageFilter::OnMessageReceived(const IPC::Message& message) {
                         OnTranslationFinished)
     IPC_MESSAGE_HANDLER(NaClHostMsg_MissingArchError,
                         OnMissingArchError)
-    IPC_MESSAGE_HANDLER_DELAY_REPLY(NaClHostMsg_OpenNaClExecutable,
-                                    OnOpenNaClExecutable)
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(NaClHostMsg_OpenNaClResources,
+                                    OnOpenNaClResources)
     IPC_MESSAGE_HANDLER(NaClHostMsg_NaClGetNumProcessors,
                         OnNaClGetNumProcessors)
     IPC_MESSAGE_HANDLER(NaClHostMsg_NaClDebugEnabledForURL,
@@ -169,6 +169,7 @@ void NaClHostMessageFilter::LaunchNaClContinuation(
     Send(reply_msg);
     return;
   }
+  // TODO(yusukes): Support pre-opening resource files on Windows.
 #elif defined(OS_POSIX)
   nexe_file =
       IPC::PlatformFileForTransitToPlatformFile(launch_params.nexe_file);
@@ -180,6 +181,7 @@ void NaClHostMessageFilter::LaunchNaClContinuation(
       GURL(launch_params.manifest_url),
       base::File(nexe_file),
       nexe_token,
+      launch_params.resource_files_info,
       permissions,
       launch_params.render_view_id,
       launch_params.permission_bits,
@@ -284,16 +286,16 @@ void NaClHostMessageFilter::OnMissingArchError(int render_view_id) {
       ShowMissingArchInfobar(render_process_id_, render_view_id);
 }
 
-void NaClHostMessageFilter::OnOpenNaClExecutable(
+void NaClHostMessageFilter::OnOpenNaClResources(
     int render_view_id,
-    const GURL& file_url,
+    const std::vector<GURL>& resource_urls,
     bool enable_validation_caching,
     IPC::Message* reply_msg) {
-  nacl_file_host::OpenNaClExecutable(this,
-                                     render_view_id,
-                                     file_url,
-                                     enable_validation_caching,
-                                     reply_msg);
+  nacl_file_host::OpenNaClResources(this,
+                                    render_view_id,
+                                    resource_urls,
+                                    enable_validation_caching,
+                                    reply_msg);
 }
 
 void NaClHostMessageFilter::OnNaClDebugEnabledForURL(const GURL& nmf_url,