remove reference to BiMap from tests

Change-Id: If91dba4dcb9062c6a928c56be9a1abd6e734e747
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/boxedprimitives/ReverseBoxingOperationsTest.java b/src/test/java/com/android/tools/r8/ir/optimize/boxedprimitives/ReverseBoxingOperationsTest.java
index 552abdc..e19798b 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/boxedprimitives/ReverseBoxingOperationsTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/boxedprimitives/ReverseBoxingOperationsTest.java
@@ -55,7 +55,7 @@
 
     Set<DexMethod> unboxMethods = Sets.newIdentityHashSet();
     Set<DexMethod> boxMethods = Sets.newIdentityHashSet();
-    for (DexType primitiveType : factory.primitiveToBoxed.keySet()) {
+    for (DexType primitiveType : factory.unboxPrimitiveMethod.keySet()) {
       unboxMethods.add(factory.getUnboxPrimitiveMethod(primitiveType));
       boxMethods.add(factory.getBoxPrimitiveMethod(primitiveType));
     }
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/boxedprimitives/UnboxToCheckNotNullTest.java b/src/test/java/com/android/tools/r8/ir/optimize/boxedprimitives/UnboxToCheckNotNullTest.java
index 47b7834..2001277 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/boxedprimitives/UnboxToCheckNotNullTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/boxedprimitives/UnboxToCheckNotNullTest.java
@@ -56,7 +56,7 @@
     Set<DexMethod> unboxMethods = Sets.newIdentityHashSet();
     unboxMethods.addAll(factory.unboxPrimitiveMethod.values());
     Set<DexType> boxedTypes = Sets.newIdentityHashSet();
-    boxedTypes.addAll(factory.primitiveToBoxed.values());
+    boxedTypes.addAll(factory.unboxPrimitiveMethod.keySet());
 
     // All unbox operations should have been replaced by checkNotNull operations.
     codeInspector