1 files changed, 11 insertions, 11 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java
index e2309ba184..d7bf3eaf99 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java
@@ -24,7 +24,7 @@ import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.actions.SpawnAction;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
-import com.google.devtools.build.lib.rules.cpp.CcCompilationContextInfo;
+import com.google.devtools.build.lib.rules.cpp.CcCompilationContext;
 import com.google.devtools.build.lib.rules.cpp.CcCompilationInfo;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import org.junit.Before;
@@ -108,27 +108,27 @@ public class CcProtoLibraryTest extends BuildViewTestCase {
         "proto_library(name = 'alias_proto', deps = [':foo_proto'])",
         "proto_library(name = 'foo_proto', srcs = ['foo.proto'])");
 
-    CcCompilationContextInfo ccCompilationContextInfo =
+    CcCompilationContext ccCompilationContext =
         getConfiguredTarget("//x:foo_cc_proto")
             .get(CcCompilationInfo.PROVIDER)
-            .getCcCompilationContextInfo();
-    assertThat(prettyArtifactNames(ccCompilationContextInfo.getDeclaredIncludeSrcs()))
+            .getCcCompilationContext();
+    assertThat(prettyArtifactNames(ccCompilationContext.getDeclaredIncludeSrcs()))
         .containsExactly("x/foo.pb.h");
   }
 
   @Test
-  public void ccCompilationContextInfo() throws Exception {
+  public void ccCompilationContext() throws Exception {
     scratch.file(
         "x/BUILD",
         "cc_proto_library(name = 'foo_cc_proto', deps = ['foo_proto'])",
         "proto_library(name = 'foo_proto', srcs = ['foo.proto'], deps = [':bar_proto'])",
         "proto_library(name = 'bar_proto', srcs = ['bar.proto'])");
 
-    CcCompilationContextInfo ccCompilationContextInfo =
+    CcCompilationContext ccCompilationContext =
         getConfiguredTarget("//x:foo_cc_proto")
             .get(CcCompilationInfo.PROVIDER)
-            .getCcCompilationContextInfo();
-    assertThat(prettyArtifactNames(ccCompilationContextInfo.getDeclaredIncludeSrcs()))
+            .getCcCompilationContext();
+    assertThat(prettyArtifactNames(ccCompilationContext.getDeclaredIncludeSrcs()))
         .containsExactly("x/foo.pb.h", "x/bar.pb.h");
   }
 
@@ -178,9 +178,9 @@ public class CcProtoLibraryTest extends BuildViewTestCase {
                 getTargetConfiguration().getGenfilesFragment().toString()));
 
     Artifact headerFile = getGenfilesArtifactWithNoOwner("external/bla/foo/bar.pb.h");
-    CcCompilationContextInfo ccCompilationContextInfo =
-        target.get(CcCompilationInfo.PROVIDER).getCcCompilationContextInfo();
-    assertThat(ccCompilationContextInfo.getDeclaredIncludeSrcs()).containsExactly(headerFile);
+    CcCompilationContext ccCompilationContext =
+        target.get(CcCompilationInfo.PROVIDER).getCcCompilationContext();
+    assertThat(ccCompilationContext.getDeclaredIncludeSrcs()).containsExactly(headerFile);
   }
 
   @Test