Move BlazeRuntime.getView() to CommandEnvironment. Update all callers.

--
MOS_MIGRATED_REVID=103376668

1 files changed, 4 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java
index 5639363e4a..086d7f6c19 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/standalone/StandaloneActionContextProvider.java
@@ -57,18 +57,18 @@ public class StandaloneActionContextProvider extends ActionContextProvider {
 
     @Override
     public ArtifactResolver getArtifactResolver() {
-      return runtime.getView().getArtifactFactory();
+      return env.getView().getArtifactFactory();
     }
   }
 
+  private final CommandEnvironment env;
   private final ImmutableList<ActionContext> strategies;
-  private final BlazeRuntime runtime;
 
   public StandaloneActionContextProvider(CommandEnvironment env, BuildRequest buildRequest) {
+    this.env = env;
+    BlazeRuntime runtime = env.getRuntime();
     boolean verboseFailures = buildRequest.getOptions(ExecutionOptions.class).verboseFailures;
 
-    this.runtime = env.getRuntime();
-
     TestActionContext testStrategy = new StandaloneTestStrategy(buildRequest,
         runtime.getStartupOptionsProvider(), runtime.getBinTools(), env.getClientEnv(),
         runtime.getWorkspace());
@@ -94,5 +94,4 @@ public class StandaloneActionContextProvider extends ActionContextProvider {
   public Iterable<ActionContext> getActionContexts() {
     return strategies;
   }
-
 }