Remove nonsfi token workaround.

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 358 matching lines @@
               process_type),
           &launch_result,
           &error_message_string))) {
     ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
         FROM_HERE,
         base::Bind(callback.func, callback.user_data,
                    static_cast<int32_t>(PP_ERROR_FAILED)));
     return;
   }
 
+  NexeLoadManager* load_manager = NexeLoadManager::Get(instance);
+  DCHECK(load_manager);
+  if (!load_manager) {
+    PostPPCompletionCallback(callback, PP_ERROR_FAILED);
+    base::SharedMemory::CloseHandle(launch_result.crash_info_shmem_handle);
+    return;
+  }
+  load_manager->set_nonsfi(PP_ToBool(uses_nonsfi_mode));
+
   if (!error_message_string.empty()) {
     if (PP_ToBool(main_service_runtime)) {
-      NexeLoadManager* load_manager = NexeLoadManager::Get(instance);
-      if (load_manager) {
-        load_manager->ReportLoadError(PP_NACL_ERROR_SEL_LDR_LAUNCH,
-                                      "ServiceRuntime: failed to start",
-                                      error_message_string);
-      }
+      load_manager->ReportLoadError(PP_NACL_ERROR_SEL_LDR_LAUNCH,
+                                    "ServiceRuntime: failed to start",
+                                    error_message_string);
     }
     ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
         FROM_HERE,
         base::Bind(callback.func, callback.user_data,
                    static_cast<int32_t>(PP_ERROR_FAILED)));
     return;
   }
   result_socket = launch_result.imc_channel_handle;
   instance_info.channel_handle = launch_result.ppapi_ipc_channel_handle;
   instance_info.plugin_pid = launch_result.plugin_pid;
   instance_info.plugin_child_id = launch_result.plugin_child_id;
 
   // Don't save instance_info if channel handle is invalid.
   if (IsValidChannelHandle(instance_info.channel_handle))
     g_instance_info.Get()[instance] = instance_info;
 
   *(static_cast<NaClHandle*>(imc_handle)) = ToNativeHandle(result_socket);
 
-  NexeLoadManager* load_manager = NexeLoadManager::Get(instance);
-  DCHECK(load_manager);
-  if (!load_manager) {
-    PostPPCompletionCallback(callback, PP_ERROR_FAILED);
-    base::SharedMemory::CloseHandle(launch_result.crash_info_shmem_handle);
-    return;
-  }
-
   // Store the crash information shared memory handle.
   load_manager->set_crash_info_shmem_handle(
       launch_result.crash_info_shmem_handle);
 
   // Create the trusted plugin channel.
   if (IsValidChannelHandle(launch_result.trusted_ipc_channel_handle)) {
     bool report_exit_status = PP_ToBool(main_service_runtime);
     scoped_ptr<TrustedPluginChannel> trusted_plugin_channel(
         new TrustedPluginChannel(
             load_manager,
@@ skipping 253 matching lines @@
 
 PP_FileHandle OpenNaClExecutable(PP_Instance instance,
                                  const char* file_url,
                                  uint64_t* nonce_lo,
                                  uint64_t* nonce_hi) {
   // Fast path only works for installed file URLs.
   GURL gurl(file_url);
   if (!gurl.SchemeIs("chrome-extension"))
     return PP_kInvalidFileHandle;
 
+  NexeLoadManager* load_manager = NexeLoadManager::Get(instance);
+  DCHECK(load_manager);
+  if (!load_manager)
+    return PP_kInvalidFileHandle;
+  if (load_manager->nonsfi())

[Mark Seaborn, 2015/01/12 21:25:45]

So this caused a fallback to a slow path in the caller, DownloadNexe()...

+    return PP_kInvalidFileHandle;
+
   content::PepperPluginInstance* plugin_instance =
       content::PepperPluginInstance::Get(instance);
   if (!plugin_instance)
     return PP_kInvalidFileHandle;
   // IMPORTANT: Make sure the document can request the given URL. If we don't
   // check, a malicious app could probe the extension system. This enforces a
   // same-origin policy which prevents the app from requesting resources from
   // another app.
   blink::WebSecurityOrigin security_origin =
       plugin_instance->GetContainer()->element().document().securityOrigin();
@@ skipping 529 matching lines @@
                                             &out_file_info->token_hi);
   if (handle != PP_kInvalidFileHandle) {
     DownloadNexeCompletion(request,
                            out_file_info,
                            FileDownloader::SUCCESS,
                            base::File(handle),
                            200);
     return;
   }
 
   // The fast path didn't work, we'll fetch the file using URLLoader and write

[Mark Seaborn, 2015/01/12 21:25:45]

So the reason for the performance regression was that this change causes Non-SFI
Mode to fall back to this code path, where open_resource() makes a copy of each
file?

Oops.  I should have realised that.  I actually didn't realise that we still
*have* a code path that makes a copy of each file on startup.

   // it to local storage.
   base::File target_file(CreateTemporaryFile(instance));
   GURL gurl(url);
 
   content::PepperPluginInstance* plugin_instance =
       content::PepperPluginInstance::Get(instance);
   if (!plugin_instance) {
     ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
         FROM_HERE,
         base::Bind(callback.func, callback.user_data,
@@ skipping 446 matching lines @@
   &StreamPexe
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl