Revert 268250 "Pepper: Move manifest logic to components/nacl."

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

Index: trunk/src/ppapi/native_client/src/trusted/plugin/plugin.h
===================================================================
--- trunk/src/ppapi/native_client/src/trusted/plugin/plugin.h	(revision 268257)
+++ trunk/src/ppapi/native_client/src/trusted/plugin/plugin.h	(working copy)
@@ -111,7 +111,7 @@
   // Returns NULL or the NaClSubprocess of the new helper NaCl module.
   NaClSubprocess* LoadHelperNaClModule(const nacl::string& helper_url,
                                        nacl::DescWrapper* wrapper,
-                                       int32_t manifest_id,
+                                       const Manifest* manifest,
                                        ErrorInfo* error_info);
 
   enum LengthComputable {
@@ -164,6 +164,8 @@
   // document to request the URL using CORS even if this function returns false.
   bool DocumentCanRequest(const std::string& url);
 
+  Manifest const* manifest() const { return manifest_.get(); }
+
   // set_exit_status may be called off the main thread.
   void set_exit_status(int exit_status);
 
@@ -204,7 +206,7 @@
   // This will fully initialize the |subprocess| if the load was successful.
   bool LoadNaClModuleFromBackgroundThread(nacl::DescWrapper* wrapper,
                                           NaClSubprocess* subprocess,
-                                          int32_t manifest_id,
+                                          const Manifest* manifest,
                                           const SelLdrStartParams& params);
 
   // Start sel_ldr from the main thread, given the start params.
@@ -302,6 +304,9 @@
 
   nacl::scoped_ptr<PnaclCoordinator> pnacl_coordinator_;
 
+  // The manifest dictionary.  Used for looking up resources to be loaded.
+  nacl::scoped_ptr<Manifest> manifest_;
+
   // Keep track of the FileDownloaders created to fetch urls.
   std::set<FileDownloader*> url_downloaders_;
   // Keep track of file descriptors opened by StreamAsFile().
@@ -329,7 +334,6 @@
   int64_t nexe_open_time_;
 
   PP_Var manifest_data_var_;
-  int32_t manifest_id_;
 
   const PPB_NaCl_Private* nacl_interface_;
   pp::UMAPrivate uma_interface_;