Pepper: Stop using SRPC for irt_open_resource().

ppapi/native_client/src/trusted/plugin/service_runtime.h

 /* -*- c++ -*- */
 /*
  * Copyright (c) 2012 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.
  */
 
 // A class containing information regarding a socket connection to a
 // service runtime instance.
 
@@ skipping 50 matching lines @@
   nacl::string url;
   PP_NaClFileInfo file_info;
   bool uses_irt;
   bool uses_ppapi;
   bool enable_dev_interfaces;
   bool enable_dyncode_syscalls;
   bool enable_exception_handling;
   bool enable_crash_throttling;
 };
 
-// Callback resources are essentially our continuation state.
-struct OpenManifestEntryResource {
- public:
-  OpenManifestEntryResource(const std::string& target_url,
-                            struct NaClFileInfo* finfo,
-                            bool* op_complete)
-      : url(target_url),
-        file_info(finfo),
-        op_complete_ptr(op_complete) {}
-  ~OpenManifestEntryResource();
-
-  std::string url;
-  struct NaClFileInfo* file_info;
-  PP_NaClFileInfo pp_file_info;
-  bool* op_complete_ptr;
-};
-
 // Do not invoke from the main thread, since the main methods will
 // invoke CallOnMainThread and then wait on a condvar for the task to
 // complete: if invoked from the main thread, the main method not
 // returning (and thus unblocking the main thread) means that the
 // main-thread continuation methods will never get called, and thus
 // we'd get a deadlock.
 class PluginReverseInterface: public nacl::ReverseInterface {
  public:
-  PluginReverseInterface(nacl::WeakRefAnchor* anchor,
-                         PP_Instance pp_instance,
+  PluginReverseInterface(PP_Instance pp_instance,
                          ServiceRuntime* service_runtime,
                          pp::CompletionCallback init_done_cb,
                          pp::CompletionCallback crash_cb);
 
   virtual ~PluginReverseInterface();
 
   void ShutDown();
 
   virtual void DoPostMessage(nacl::string message);
 
   virtual void StartupInitializationComplete();
 
   virtual bool OpenManifestEntry(nacl::string url_key,
                                  struct NaClFileInfo *info);
 
   virtual void ReportCrash();
 
   virtual void ReportExitStatus(int exit_status);
 
   // TODO(teravest): Remove this method once it's gone from
   // nacl::ReverseInterface.
   virtual int64_t RequestQuotaForWrite(nacl::string file_id,
                                        int64_t offset,
                                        int64_t bytes_to_write);
 
- protected:
-  virtual void OpenManifestEntry_MainThreadContinuation(
-      OpenManifestEntryResource* p,
-      int32_t err);
-
-  virtual void StreamAsFile_MainThreadContinuation(
-      OpenManifestEntryResource* p,
-      int32_t result);
-
  private:
-  nacl::WeakRefAnchor* anchor_;  // holds a ref
-  // Should be used only in main thread in WeakRef-protected callbacks.
   PP_Instance pp_instance_;
   ServiceRuntime* service_runtime_;
   NaClMutex mu_;
   NaClCondVar cv_;
   bool shutting_down_;
 
   pp::CompletionCallback init_done_cb_;
   pp::CompletionCallback crash_cb_;
 };
 
@@ skipping 70 matching lines @@
   void ReportLoadError(const ErrorInfo& error_info);
 
   NaClSrpcChannel command_channel_;
   Plugin* plugin_;
   PP_Instance pp_instance_;
   bool main_service_runtime_;
   bool uses_nonsfi_mode_;
   nacl::ReverseService* reverse_service_;
   nacl::scoped_ptr<SelLdrLauncherChrome> subprocess_;
 
-  nacl::WeakRefAnchor* anchor_;
-
   PluginReverseInterface* rev_interface_;
 
   // Mutex and CondVar to protect start_sel_ldr_done_ and nexe_started_.
   NaClMutex mu_;
   NaClCondVar cond_;
   bool start_sel_ldr_done_;
   bool start_nexe_done_;
   bool nexe_started_ok_;
 
   NaClHandle bootstrap_channel_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_