Pepper: Stop using SRPC for irt_open_resource().

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 185 matching lines @@
     std::string url;
     // TODO(teravest): Clean up pnacl_options logic in JsonManifest so we don't
     // have to initialize it like this here.
     PP_PNaClOptions pnacl_options;
     pnacl_options.translate = PP_FALSE;
     pnacl_options.is_debug = PP_FALSE;
     pnacl_options.opt_level = 2;
     if (!ManifestResolveKey(pp_instance_, false, key, &url, &pnacl_options)) {
       base::MessageLoop::current()->PostTask(
           FROM_HERE,
-          base::Bind(callback, base::Passed(base::File())));
+          base::Bind(callback, base::Passed(base::File()), 0, 0));
       return;
     }
 
     // We have to call DidDownloadFile, even if this object is destroyed, so
     // that the handle inside PP_NaClFileInfo isn't leaked. This means that the
     // callback passed to this function shouldn't have a weak pointer to an
     // object either.
     //
     // TODO(teravest): Make a type like PP_NaClFileInfo to use for DownloadFile
     // that would close the file handle on destruction.
     DownloadFile(pp_instance_, url,
                  base::Bind(&ManifestServiceProxy::DidDownloadFile, callback));
   }
 
  private:
   static void DidDownloadFile(
       ManifestServiceChannel::OpenResourceCallback callback,
       int32_t pp_error,
       const PP_NaClFileInfo& file_info) {
     if (pp_error != PP_OK) {
-      callback.Run(base::File());
+      callback.Run(base::File(), 0, 0);
       return;
     }
-    callback.Run(base::File(file_info.handle));
+    callback.Run(base::File(file_info.handle),
+                 file_info.token_lo,
+                 file_info.token_hi);
   }
 
   PP_Instance pp_instance_;
   DISALLOW_COPY_AND_ASSIGN(ManifestServiceProxy);
 };
 
 blink::WebURLLoader* CreateWebURLLoader(const blink::WebDocument& document,
                                         const GURL& gurl) {
   blink::WebURLLoaderOptions options;
   options.untrustedHTTP = true;
@@ skipping 173 matching lines @@
             content::RenderThread::Get()->GetShutdownEvent(),
             report_exit_status));
     load_manager->set_trusted_plugin_channel(trusted_plugin_channel.Pass());
   } else {
     PostPPCompletionCallback(callback, PP_ERROR_FAILED);
     return;
   }
 
   // Create the manifest service handle as well.
   // For security hardening, disable the IPCs for open_resource() when they
-  // aren't needed.  PNaCl doesn't expose open_resource(), and the new
-  // open_resource() IPCs are currently only used for Non-SFI NaCl so far,
-  // not SFI NaCl. Note that enable_dyncode_syscalls is true if and only if
-  // the plugin is a non-PNaCl plugin.
+  // aren't needed.  PNaCl doesn't expose open_resource().  Note that
+  // enable_dyncode_syscalls is true if and only if the plugin is a non-PNaCl
+  // plugin.
   if (load_manager &&
       enable_dyncode_syscalls &&
-      uses_nonsfi_mode &&
       IsValidChannelHandle(
           launch_result.manifest_service_ipc_channel_handle)) {
     scoped_ptr<ManifestServiceChannel> manifest_service_channel(
         new ManifestServiceChannel(
             launch_result.manifest_service_ipc_channel_handle,
             base::Bind(&PostPPCompletionCallback, callback),
             manifest_service_proxy.Pass(),
             content::RenderThread::Get()->GetShutdownEvent()));
     load_manager->set_manifest_service_channel(
         manifest_service_channel.Pass());
@@ skipping 1243 matching lines @@
   &StreamPexe
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl