Merge changes I9a71ea46,Ib14c294a,Id91c2be4,I3fa77e2e

* changes:
  Remove last remaining guava dependencies.
  Use a custom parser implementation instead of perflib.
  Remove perflib-based native allocation registry identification.
  ahat: Expand test coverage using static heap dumps.

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/ahat/src/heapdump/DiffedFieldValue.java b/tools/ahat/src/heapdump/DiffedFieldValue.java
index e2dcf3e8f0..3cd273ed98 100644
--- a/tools/ahat/src/heapdump/DiffedFieldValue.java
+++ b/tools/ahat/src/heapdump/DiffedFieldValue.java
@@ -23,7 +23,7 @@ import java.util.Objects;
  */
 public class DiffedFieldValue {
   public final String name;
-  public final String type;
+  public final Type type;
   public final Value current;
   public final Value baseline;
 
@@ -60,7 +60,7 @@ public class DiffedFieldValue {
     return new DiffedFieldValue(baseline.name, baseline.type, null, baseline.value, Status.DELETED);
   }
 
-  private DiffedFieldValue(String name, String type, Value current, Value baseline, Status status) {
+  private DiffedFieldValue(String name, Type type, Value current, Value baseline, Status status) {
     this.name = name;
     this.type = type;
     this.current = current;