Clear environment variables for nacl_helper

components/nacl/zygote/nacl_fork_delegate_linux.h

 // 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.
 
 #ifndef COMPONENTS_NACL_ZYGOTE_NACL_FORK_DELEGATE_LINUX_H_
 #define COMPONENTS_NACL_ZYGOTE_NACL_FORK_DELEGATE_LINUX_H_
 
 #include <string>
 #include <vector>
 
 #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;
 
 namespace nacl {
 
 // Appends any ZygoteForkDelegate instances needed by NaCl to |*delegates|.
 void AddNaClZygoteForkDelegates(
     ScopedVector<content::ZygoteForkDelegate>* delegates);
 
 // The NaClForkDelegate is created during Chrome linux zygote
@@ skipping 13 matching lines @@
   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;
 
  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 {
     kNaClHelperUnused = 0,
     kNaClHelperMissing = 1,
     kNaClHelperBootstrapMissing = 2,
     kNaClHelperValgrind = 3,
     kNaClHelperLaunchFailed = 4,
     kNaClHelperAckFailed = 5,
     kNaClHelperSuccess = 6,
     kNaClHelperStatusBoundary  // Must be one greater than highest value used.
   };
 
   const bool nonsfi_mode_;
   NaClHelperStatus status_;
   int fd_;
 
+  FRIEND_TEST_ALL_PREFIXES(::NaClForkDelegateLinuxTest, EnvPassthrough);
+
   DISALLOW_COPY_AND_ASSIGN(NaClForkDelegate);
 };
 
 }  // namespace nacl
 
 #endif  // COMPONENTS_NACL_ZYGOTE_NACL_FORK_DELEGATE_LINUX_H_