| 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 12a7c772f6853464a7166fc4347902ede6ec68f0..6a72a0151577730ab66f40d532285da63e9bb1e2 100644
|
| --- a/components/nacl/zygote/nacl_fork_delegate_linux.h
|
| +++ b/components/nacl/zygote/nacl_fork_delegate_linux.h
|
| @@ -10,8 +10,13 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/gtest_prod_util.h"
|
| #include "content/public/common/zygote_fork_delegate_linux.h"
|
|
|
| +namespace base {
|
| +struct LaunchOptions;
|
| +}
|
| +
|
| template <typename>
|
| class ScopedVector;
|
|
|
| @@ -45,6 +50,8 @@ class NaClForkDelegate : public content::ZygoteForkDelegate {
|
| int* exit_code) OVERRIDE;
|
|
|
| private:
|
| + static void AddPassthroughEnvToOptions(base::LaunchOptions* options);
|
| +
|
| // These values are reported via UMA and hence they become permanent
|
| // constants. Old values cannot be reused, only new ones added.
|
| enum NaClHelperStatus {
|
| @@ -62,6 +69,8 @@ class NaClForkDelegate : public content::ZygoteForkDelegate {
|
| NaClHelperStatus status_;
|
| int fd_;
|
|
|
| + FRIEND_TEST_ALL_PREFIXES(NaClForkDelegateLinuxTest, EnvPassthrough);
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(NaClForkDelegate);
|
| };
|
|
|
|
|