Clear environment variables for nacl_helper

components/nacl/zygote/nacl_fork_delegate_linux.h

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..c62429269fc0c6ba35c487cd675c7e7708c6680b 100644
--- a/components/nacl/zygote/nacl_fork_delegate_linux.h
+++ b/components/nacl/zygote/nacl_fork_delegate_linux.h
@@ -10,8 +10,15 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
 #include "content/public/common/zygote_fork_delegate_linux.h"
 
+FORWARD_DECLARE_TEST(NaClForkDelegateLinuxTest, EnvPassthrough);
+
+namespace base {
+struct LaunchOptions;
+}
+
 template <typename>
 class ScopedVector;
 
@@ -45,6 +52,8 @@ class NaClForkDelegate : public content::ZygoteForkDelegate {
                                     int* exit_code) OVERRIDE;
 
  private:
+  static void AddPassthroughEnvToOptions(base::LaunchOptions& options);

[jln (very slow on Chromium), 2014/06/03 22:58:13]

Style: this really should be a pointer.

[elijahtaylor1, 2014/06/03 23:22:10]

In fairness, I *really* meant to do it, but didn't :)

Done.

+
   // 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 +71,8 @@ class NaClForkDelegate : public content::ZygoteForkDelegate {
   NaClHelperStatus status_;
   int fd_;
 
+  FRIEND_TEST_ALL_PREFIXES(::NaClForkDelegateLinuxTest, EnvPassthrough);
+
   DISALLOW_COPY_AND_ASSIGN(NaClForkDelegate);
 };