Pepper: Move manifest logic to components/nacl.

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 22 matching lines @@
 class DescWrapper;
 }  // namespace
 
 namespace pp {
 class FileIO;
 }  // namespace
 
 namespace plugin {
 
 class ErrorInfo;
-class Manifest;
 class Plugin;
 class SrpcClient;
 class ServiceRuntime;
 
 // Struct of params used by StartSelLdr.  Use a struct so that callback
 // creation templates aren't overwhelmed with too many parameters.
 struct SelLdrStartParams {
   SelLdrStartParams(const nacl::string& url,
                     bool uses_irt,
                     bool uses_ppapi,
@@ skipping 79 matching lines @@
 // 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,
                          Plugin* plugin,
-                         const Manifest* manifest,
+                         int32_t manifest_id,
                          ServiceRuntime* service_runtime,
                          pp::CompletionCallback init_done_cb,
                          pp::CompletionCallback crash_cb);
 
   virtual ~PluginReverseInterface();
 
   void ShutDown();
 
   virtual void DoPostMessage(nacl::string message);
 
@@ skipping 29 matching lines @@
       int32_t result);
 
   virtual void CloseManifestEntry_MainThreadContinuation(
       CloseManifestEntryResource* cls,
       int32_t err);
 
  private:
   nacl::WeakRefAnchor* anchor_;  // holds a ref
   Plugin* plugin_;  // value may be copied, but should be used only in
                     // main thread in WeakRef-protected callbacks.
-  const Manifest* manifest_;
+  int32_t manifest_id_;
   ServiceRuntime* service_runtime_;
   NaClMutex mu_;
   NaClCondVar cv_;
   std::set<int64_t> quota_files_;
   bool shutting_down_;
 
   pp::CompletionCallback init_done_cb_;
   pp::CompletionCallback crash_cb_;
 };
 
 //  ServiceRuntime abstracts a NativeClient sel_ldr instance.
 class ServiceRuntime {
  public:
   // TODO(sehr): This class should also implement factory methods, using the
   // Start method below.
   ServiceRuntime(Plugin* plugin,
-                 const Manifest* manifest,
+                 int32_t manifest_id,
                  bool main_service_runtime,
                  bool uses_nonsfi_mode,
                  pp::CompletionCallback init_done_cb,
                  pp::CompletionCallback crash_cb);
   // The destructor terminates the sel_ldr process.
   ~ServiceRuntime();
 
   // Spawn the sel_ldr instance.
   void StartSelLdr(const SelLdrStartParams& params,
                    pp::CompletionCallback callback);
@@ skipping 64 matching lines @@
   int exit_status_;
   bool start_sel_ldr_done_;
 
   PP_Var start_sel_ldr_error_message_;
   pp::CompletionCallbackFactory<ServiceRuntime> callback_factory_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_