Go through retracer when looking up field name

Change-Id: Ic708966669813c411137b26527d6a6a9682b5e70

src/test/java/com/android/tools/r8/utils/codeinspector/FoundClassSubject.java

diff --git a/src/test/java/com/android/tools/r8/utils/codeinspector/FoundClassSubject.java b/src/test/java/com/android/tools/r8/utils/codeinspector/FoundClassSubject.java
index 2c83ae7..ff35c6e 100644
--- a/src/test/java/com/android/tools/r8/utils/codeinspector/FoundClassSubject.java
+++ b/src/test/java/com/android/tools/r8/utils/codeinspector/FoundClassSubject.java
@@ -226,7 +226,7 @@
   // TODO(b/169882658): This should be removed when we have identity mappings for ambiguous cases.
   public FieldSubject uniqueFieldWithOriginalName(String name, TypeReference originalType) {
     Retracer retracer = codeInspector.retrace();
-    RetraceClassElement retraceClassResult = retraceUnique();
+    ClassReference finalReference = getFinalReference();
     Set<FoundFieldSubject> candidates = Sets.newIdentityHashSet();
     Set<FoundFieldSubject> sameTypeCandidates = Sets.newIdentityHashSet();
     for (FoundFieldSubject candidate : allFields()) {
@@ -238,7 +238,8 @@
           sameTypeCandidates.add(candidate);
         }
       }
-      retraceClassResult
+      retracer
+          .retraceClass(finalReference)
           .lookupField(candidate.getFinalName())
           .forEach(
               element -> {