Rename some of native declared providers according to the new naming scheme.

RELNOTES: None
PiperOrigin-RevId: 165910455

4 files changed, 16 insertions, 16 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/ExecutionInfoProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/test/ExecutionInfo.java
index 616db25bb4..9dfa3d7648 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/ExecutionInfoProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/ExecutionInfo.java
@@ -24,16 +24,16 @@ import java.util.Map;
  * tests).
  */
 @Immutable
-public final class ExecutionInfoProvider extends Info {
+public final class ExecutionInfo extends Info {
 
-  /** Skylark constructor and identifier for ExecutionInfoProvider. */
-  public static final NativeProvider<ExecutionInfoProvider> SKYLARK_CONSTRUCTOR =
-      new NativeProvider<ExecutionInfoProvider>(ExecutionInfoProvider.class, "ExecutionInfo") {};
+  /** Skylark constructor and identifier for ExecutionInfo. */
+  public static final NativeProvider<ExecutionInfo> PROVIDER =
+      new NativeProvider<ExecutionInfo>(ExecutionInfo.class, "ExecutionInfo") {};
 
   private final ImmutableMap<String, String> executionInfo;
 
-  public ExecutionInfoProvider(Map<String, String> requirements) {
-    super(SKYLARK_CONSTRUCTOR, ImmutableMap.<String, Object>of("requirements", requirements));
+  public ExecutionInfo(Map<String, String> requirements) {
+    super(PROVIDER, ImmutableMap.<String, Object>of("requirements", requirements));
     this.executionInfo = ImmutableMap.copyOf(requirements);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestActionBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestActionBuilder.java
index 3194f3f529..bb6b609962 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestActionBuilder.java
@@ -55,7 +55,7 @@ public final class TestActionBuilder {
   private final RuleContext ruleContext;
   private RunfilesSupport runfilesSupport;
   private Artifact executable;
-  private ExecutionInfoProvider executionRequirements;
+  private ExecutionInfo executionRequirements;
   private InstrumentedFilesProvider instrumentedFiles;
   private int explicitShardCount;
   private Map<String, String> extraEnv;
@@ -113,7 +113,7 @@ public final class TestActionBuilder {
   }
 
   public TestActionBuilder setExecutionRequirements(
-      @Nullable ExecutionInfoProvider executionRequirements) {
+      @Nullable ExecutionInfo executionRequirements) {
     this.executionRequirements = executionRequirements;
     return this;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestEnvironmentProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestEnvironmentInfo.java
index fb1125f31e..ec16185907 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestEnvironmentProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestEnvironmentInfo.java
@@ -23,18 +23,18 @@ import java.util.Map;
 
 /** Provider containing any additional environment variables for use in the test action. */
 @Immutable
-public final class TestEnvironmentProvider extends Info {
+public final class TestEnvironmentInfo extends Info {
 
-  /** Skylark constructor and identifier for TestEnvironmentProvider. */
-  public static final NativeProvider<TestEnvironmentProvider> SKYLARK_CONSTRUCTOR =
-      new NativeProvider<TestEnvironmentProvider>(
-          TestEnvironmentProvider.class, "TestEnvironment") {};
+  /** Skylark constructor and identifier for TestEnvironmentInfo. */
+  public static final NativeProvider<TestEnvironmentInfo> PROVIDER =
+      new NativeProvider<TestEnvironmentInfo>(
+          TestEnvironmentInfo.class, "TestEnvironment") {};
 
   private final Map<String, String> environment;
 
   /** Constructs a new provider with the given variable name to variable value mapping. */
-  public TestEnvironmentProvider(Map<String, String> environment) {
-    super(SKYLARK_CONSTRUCTOR, ImmutableMap.<String, Object>of("environment", environment));
+  public TestEnvironmentInfo(Map<String, String> environment) {
+    super(PROVIDER, ImmutableMap.<String, Object>of("environment", environment));
     this.environment = Preconditions.checkNotNull(environment);
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestTargetProperties.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestTargetProperties.java
index d55d066966..a2e33d4850 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestTargetProperties.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestTargetProperties.java
@@ -74,7 +74,7 @@ public class TestTargetProperties {
    * will be called only for test configured targets.
    */
   TestTargetProperties(RuleContext ruleContext,
-      ExecutionInfoProvider executionRequirements) {
+      ExecutionInfo executionRequirements) {
     Rule rule = ruleContext.getRule();
 
     Preconditions.checkState(TargetUtils.isTestRule(rule));