Pepper: Manifest ID cleanup.

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 82 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,
-                         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 err);
 
   virtual void StreamAsFile_MainThreadContinuation(
       OpenManifestEntryResource* p,
       int32_t result);
 
  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.
-  int32_t manifest_id_;
   ServiceRuntime* service_runtime_;
   NaClMutex mu_;
   NaClCondVar cv_;
   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,
-                 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 25 matching lines @@
 
   // exit_status is -1 when invalid; when we set it, we will ensure
   // that it is non-negative (the portion of the exit status from the
   // nexe that is transferred is the low 8 bits of the argument to the
   // exit syscall).
   int exit_status();  // const, but grabs mutex etc.
   void set_exit_status(int exit_status);
 
   nacl::string GetCrashLogOutput();
 
+  bool main_service_runtime() const { return main_service_runtime_; }
+
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(ServiceRuntime);
   bool SetupCommandChannel();
   bool LoadModule(PP_NaClFileInfo file_info);
   bool InitReverseService();
   bool StartModule();
 
   NaClSrpcChannel command_channel_;
   Plugin* plugin_;
   bool main_service_runtime_;
   bool uses_nonsfi_mode_;
   nacl::ReverseService* reverse_service_;
   nacl::scoped_ptr<nacl::SelLdrLauncherBase> subprocess_;
 
   nacl::WeakRefAnchor* anchor_;
 
   PluginReverseInterface* rev_interface_;
 
   // Mutex and CondVar to protect start_sel_ldr_done_.
   NaClMutex mu_;
   NaClCondVar cond_;
   bool start_sel_ldr_done_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_