Update EnsurePartitionMapOutputConsumer to not use any non-public apis

Change-Id: I5a6fe115299f28cef01b49aabd3cb2809b562c2d

src/test/java/com/android/tools/r8/compilerapi/partitionmap/PartitionMapCommandTest.java

diff --git a/src/test/java/com/android/tools/r8/compilerapi/partitionmap/PartitionMapCommandTest.java b/src/test/java/com/android/tools/r8/compilerapi/partitionmap/PartitionMapCommandTest.java
index 7d178b7..47cb0c9 100644
--- a/src/test/java/com/android/tools/r8/compilerapi/partitionmap/PartitionMapCommandTest.java
+++ b/src/test/java/com/android/tools/r8/compilerapi/partitionmap/PartitionMapCommandTest.java
@@ -22,7 +22,6 @@
 import com.android.tools.r8.origin.Origin;
 import com.android.tools.r8.retrace.MappingPartition;
 import com.android.tools.r8.retrace.MappingPartitionMetadata;
-import com.android.tools.r8.utils.BooleanBox;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
@@ -60,10 +59,7 @@
 
   private void runTest(Runner test) throws Exception {
     EnsurePartitionMapOutputConsumer partitionConsumer = EnsurePartitionMapOutputConsumer.get();
-    test.run(
-        DexIndexedConsumer.emptyConsumer(),
-        StringConsumer.emptyConsumer(),
-        partitionConsumer.getConsumer());
+    test.run(DexIndexedConsumer.emptyConsumer(), StringConsumer.emptyConsumer(), partitionConsumer);
     assertTrue(partitionConsumer.hasOutput());
   }
 
@@ -114,7 +110,7 @@
       runR8(
           DexIndexedConsumer.emptyConsumer(),
           StringConsumer.emptyConsumer(),
-          ensurePartitionMapOutputConsumer.getConsumer());
+          ensurePartitionMapOutputConsumer);
     }
 
     @Test
@@ -124,53 +120,38 @@
       runD8(
           DexIndexedConsumer.emptyConsumer(),
           StringConsumer.emptyConsumer(),
-          ensurePartitionMapOutputConsumer.getConsumer());
+          ensurePartitionMapOutputConsumer);
     }
 
-    public static class EnsurePartitionMapOutputConsumer {
+    public static class EnsurePartitionMapOutputConsumer implements PartitionMapConsumer {
 
-      private final List<String> keys;
-      private final BooleanBox finished;
-      private final PartitionMapConsumer consumer;
+      private final List<String> keys = new ArrayList<>();
+      private boolean finished = false;
 
-      private EnsurePartitionMapOutputConsumer(
-          List<String> keys, BooleanBox finished, PartitionMapConsumer consumer) {
-        this.keys = keys;
-        this.finished = finished;
-        this.consumer = consumer;
-      }
-
-      private PartitionMapConsumer getConsumer() {
-        return consumer;
-      }
+      private EnsurePartitionMapOutputConsumer() {}
 
       private boolean hasOutput() {
-        return finished.get() && !keys.isEmpty();
+        return finished && !keys.isEmpty();
       }
 
       public static EnsurePartitionMapOutputConsumer get() {
-        List<String> keys = new ArrayList<>();
-        BooleanBox finished = new BooleanBox();
-        return new EnsurePartitionMapOutputConsumer(
-            keys,
-            finished,
-            new PartitionMapConsumer() {
-              @Override
-              public void acceptMappingPartition(MappingPartition mappingPartition) {
-                keys.add(mappingPartition.getKey());
-              }
+        return new EnsurePartitionMapOutputConsumer();
+      }
 
-              @Override
-              public void acceptMappingPartitionMetadata(
-                  MappingPartitionMetadata mappingPartitionMetadata) {
-                keys.add("METADATA");
-              }
+      @Override
+      public void acceptMappingPartition(MappingPartition mappingPartition) {
+        keys.add(mappingPartition.getKey());
+      }
 
-              @Override
-              public void finished(DiagnosticsHandler handler) {
-                finished.set();
-              }
-            });
+      @Override
+      public void acceptMappingPartitionMetadata(
+          MappingPartitionMetadata mappingPartitionMetadata) {
+        keys.add("METADATA");
+      }
+
+      @Override
+      public void finished(DiagnosticsHandler handler) {
+        finished = true;
       }
     }
   }

third_party/binary_compatibility_tests/compiler_api_tests.tar.gz.sha1

diff --git a/third_party/binary_compatibility_tests/compiler_api_tests.tar.gz.sha1 b/third_party/binary_compatibility_tests/compiler_api_tests.tar.gz.sha1
index f8f8621..e5b5e41 100644
--- a/third_party/binary_compatibility_tests/compiler_api_tests.tar.gz.sha1
+++ b/third_party/binary_compatibility_tests/compiler_api_tests.tar.gz.sha1
@@ -1 +1 @@
-0f1c0cad66ef6da189e01db262a3dbaa124be0c8
\ No newline at end of file
+2aaa39dd57bf8c1c21393ae6b3181ae3a10da88e
\ No newline at end of file