| Index: components/nacl/zygote/nacl_fork_delegate_linux.h
|
| diff --git a/components/nacl/zygote/nacl_fork_delegate_linux.h b/components/nacl/zygote/nacl_fork_delegate_linux.h
|
| index 5d7b6b854a0f74f59eb4c46f5b540b2834794101..ba79a7cf54706294dcc0082ac6bb8b0c2312bbfc 100644
|
| --- a/components/nacl/zygote/nacl_fork_delegate_linux.h
|
| +++ b/components/nacl/zygote/nacl_fork_delegate_linux.h
|
| @@ -34,20 +34,23 @@ void AddNaClZygoteForkDelegates(
|
| class NaClForkDelegate : public content::ZygoteForkDelegate {
|
| public:
|
| explicit NaClForkDelegate(bool nonsfi_mode);
|
| - virtual ~NaClForkDelegate();
|
| -
|
| - virtual void Init(int sandboxdesc, bool enable_layer1_sandbox) override;
|
| - virtual void InitialUMA(std::string* uma_name,
|
| - int* uma_sample,
|
| - int* uma_boundary_value) override;
|
| - virtual bool CanHelp(const std::string& process_type, std::string* uma_name,
|
| - int* uma_sample, int* uma_boundary_value) override;
|
| - virtual pid_t Fork(const std::string& process_type,
|
| - const std::vector<int>& fds,
|
| - const std::string& channel_id) override;
|
| - virtual bool GetTerminationStatus(pid_t pid, bool known_dead,
|
| - base::TerminationStatus* status,
|
| - int* exit_code) override;
|
| + ~NaClForkDelegate() override;
|
| +
|
| + void Init(int sandboxdesc, bool enable_layer1_sandbox) override;
|
| + void InitialUMA(std::string* uma_name,
|
| + int* uma_sample,
|
| + int* uma_boundary_value) override;
|
| + bool CanHelp(const std::string& process_type,
|
| + std::string* uma_name,
|
| + int* uma_sample,
|
| + int* uma_boundary_value) override;
|
| + pid_t Fork(const std::string& process_type,
|
| + const std::vector<int>& fds,
|
| + const std::string& channel_id) override;
|
| + bool GetTerminationStatus(pid_t pid,
|
| + bool known_dead,
|
| + base::TerminationStatus* status,
|
| + int* exit_code) override;
|
|
|
| private:
|
| static void AddPassthroughEnvToOptions(base::LaunchOptions* options);
|
|
|