Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / nacl / browser / nacl_process_host.h

diff --git a/src/components/nacl/browser/nacl_process_host.h b/src/components/nacl/browser/nacl_process_host.h
index 35c3b5c..eb138b6 100644 (file)
--- a/src/components/nacl/browser/nacl_process_host.h
+++ b/src/components/nacl/browser/nacl_process_host.h
@@ -53,17 +53,9 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
   // permissions: PPAPI permissions, to control access to private APIs.
   // render_view_id: RenderView routing id, to control access to private APIs.
   // permission_bits: controls which interfaces the NaCl plugin can use.
-  // uses_irt: whether the launched process should use the IRT.
   // uses_nonsfi_mode: whether the program should be loaded under non-SFI mode.
-  // enable_dyncode_syscalls: whether the launched process should allow dyncode
-  //                          and mmap with PROT_EXEC.
-  // enable_exception_handling: whether the launched process should allow
-  //                            hardware exception handling.
-  // enable_crash_throttling: whether a crash of this process contributes
-  //                          to the crash throttling statistics, and also
-  //                          whether this process should not start when too
-  //                          many crashes have been observed.
   // off_the_record: was the process launched from an incognito renderer?
+  // process_type: the type of NaCl process.
   // profile_directory: is the path of current profile directory.
   NaClProcessHost(const GURL& manifest_url,
                   base::File nexe_file,
@@ -71,16 +63,13 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
                   ppapi::PpapiPermissions permissions,
                   int render_view_id,
                   uint32 permission_bits,
-                  bool uses_irt,
                   bool uses_nonsfi_mode,
-                  bool enable_dyncode_syscalls,
-                  bool enable_exception_handling,
-                  bool enable_crash_throttling,
                   bool off_the_record,
+                  NaClAppProcessType process_type,
                   const base::FilePath& profile_directory);
-  virtual ~NaClProcessHost();
+  ~NaClProcessHost() override;
 
-  virtual void OnProcessCrashed(int exit_status) OVERRIDE;
+  void OnProcessCrashed(int exit_status) override;
 
   // Do any minimal work that must be done at browser startup.
   static void EarlyStartup();
@@ -94,7 +83,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
               IPC::Message* reply_msg,
               const base::FilePath& manifest_path);
 
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
+  void OnChannelConnected(int32 peer_pid) override;
 
 #if defined(OS_WIN)
   void OnProcessLaunchedByBroker(base::ProcessHandle handle);
@@ -128,8 +117,8 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
   bool LaunchSelLdr();
 
   // BrowserChildProcessHostDelegate implementation:
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
-  virtual void OnProcessLaunched() OVERRIDE;
+  bool OnMessageReceived(const IPC::Message& msg) override;
+  void OnProcessLaunched() override;
 
   void OnResourcesReady();
 
@@ -220,15 +209,12 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
 
   scoped_ptr<content::BrowserChildProcessHost> process_;
 
-  bool uses_irt_;
   bool uses_nonsfi_mode_;
 
   bool enable_debug_stub_;
-  bool enable_dyncode_syscalls_;
-  bool enable_exception_handling_;
   bool enable_crash_throttling_;
-
   bool off_the_record_;
+  NaClAppProcessType process_type_;
 
   const base::FilePath profile_directory_;