Pepper: Remove LOAD_MODULE SRPC call in SFI mode.

components/nacl/renderer/ppb_nacl_private_impl.cc

 // Copyright 2013 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 "components/nacl/renderer/ppb_nacl_private_impl.h"
 
 #include <numeric>
 #include <string>
 #include <vector>
 
@@ skipping 284 matching lines @@
                   PP_Bool uses_nonsfi_mode,
                   PP_Bool enable_ppapi_dev,
                   PP_Bool enable_dyncode_syscalls,
                   PP_Bool enable_exception_handling,
                   PP_Bool enable_crash_throttling,
                   void* imc_handle,
                   PP_CompletionCallback callback) {
   CHECK(ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->
             BelongsToCurrentThread());
 
+  // FIXME: Remove this.

[bbudge, 2014/06/30 18:28:53]

Remove this.

[teravest, 2014/06/30 22:04:56]

Done.

+  // base::PlatformFileInfo info;
+  // CHECK(GetPlatformFileInfo(nexe_file_info->handle, &info));
+
   // Create the manifest service proxy here, so on error case, it will be
   // destructed (without passing it to ManifestServiceChannel).
   scoped_ptr<ManifestServiceChannel::Delegate> manifest_service_proxy(
       new ManifestServiceProxy(instance));
 
   FileDescriptor result_socket;
   IPC::Sender* sender = content::RenderThread::Get();
   DCHECK(sender);
   int routing_id = 0;
   // If the nexe uses ppapi APIs, we need a routing ID.
@@ skipping 21 matching lines @@
   // Conditionally block 'Dev' interfaces. We do this for the NaCl process, so
   // it's clearer to developers when they are using 'Dev' inappropriately. We
   // must also check on the trusted side of the proxy.
   if (enable_ppapi_dev)
     perm_bits |= ppapi::PERMISSION_DEV;
   instance_info.permissions =
       ppapi::PpapiPermissions::GetForCommandLine(perm_bits);
   std::string error_message_string;
   NaClLaunchResult launch_result;
 
-  content::RendererPpapiHost* host =
-      content::RendererPpapiHost::GetForPPInstance(instance);
+  IPC::PlatformFileForTransit nexe_for_transit;
+#if defined(OS_POSIX)
+  if (nexe_file_info->handle != PP_kInvalidFileHandle)

[Mark Seaborn, 2014/06/30 20:01:03]

If this is false, I think it leaves nexe_for_transit uninitialised.  I think
IPC::PlatformFileForTransit is not a constructed type.

[teravest, 2014/06/30 22:04:56]

Done.

+    nexe_for_transit = base::FileDescriptor(nexe_file_info->handle, true);
+#else

[bbudge, 2014/06/30 18:28:53]

nit: #elif defined(OS_WIN)

[teravest, 2014/06/30 22:04:56]

Done.

+  // Handle duplication is handled on the browser side instead of the renderer.

[bbudge, 2014/06/30 18:28:53]

nit wording
// Duplicate the handle on the browser side instead of the renderer.

[teravest, 2014/06/30 22:04:56]

Done.

+  // This is because BrokerGetFileForProcess isn't part of content/public, and
+  // it's simpler to do the duplication in the browser anyway.
+  nexe_for_transit = nexe_file_info->handle;
+#endif
   if (!sender->Send(new NaClHostMsg_LaunchNaCl(
           NaClLaunchParams(
               instance_info.url.spec(),
-              host->ShareHandleWithRemote(nexe_file_info->handle, true),
+              nexe_for_transit,
+              nexe_file_info->token_lo,
+              nexe_file_info->token_hi,
               routing_id,
               perm_bits,
               PP_ToBool(uses_irt),
               PP_ToBool(uses_nonsfi_mode),
               PP_ToBool(enable_dyncode_syscalls),
               PP_ToBool(enable_exception_handling),
               PP_ToBool(enable_crash_throttling)),
           &launch_result,
           &error_message_string))) {
     ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
@@ skipping 1262 matching lines @@
   &SetPNaClStartTime
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl