Access environment variables through Host object instead of directly.

third_party/WebKit/Tools/Scripts/webkitpy/common/system/systemhost.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/common/system/systemhost.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/systemhost.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/systemhost.py
index e3bbe7c6d2295b9c7d2a466df9b75e4c195f3bd0..821ad7d0e698ebc049e7426e93f40722c58cabe6 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/systemhost.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/systemhost.py
@@ -30,7 +30,7 @@ import os
 import platform
 import sys
 
-from webkitpy.common.system import environment, executive, filesystem, platforminfo, user, workspace
+from webkitpy.common.system import executive, filesystem, platforminfo, user, workspace
 
 
 class SystemHost(object):
@@ -47,7 +47,13 @@ class SystemHost(object):
         self.stderr = sys.stderr

[Dirk Pranke, 2016/07/14 19:28:13]

I would add a

  self.environ = os.environ

here instead.

[qyearsley, 2016/07/14 19:52:58]

Ah, excellent -- then the three methods below aren't necessary. This is what you
were thinking, right?

 
     def copy_current_environment(self):
-        return environment.Environment(os.environ.copy())
+        return os.environ.copy()
+
+    def get_env(self, key, default=None):
+        return os.environ.get(key, default)
+
+    def set_env(self, key, value):
+        os.environ[key] = value
 
     def print_(self, *args, **kwargs):
         sep = kwargs.get('sep', ' ')