Rewrite InputStreamReader to TextInputStream

Change-Id: Ied5d46a74b8736f949dd7ec6dce3d511dce140b4

src/test/java/com/android/tools/r8/compilerapi/startupprofile/StartupProfileApiTest.java

diff --git a/src/test/java/com/android/tools/r8/compilerapi/startupprofile/StartupProfileApiTest.java b/src/test/java/com/android/tools/r8/compilerapi/startupprofile/StartupProfileApiTest.java
index 2ea14dc..a11e128 100644
--- a/src/test/java/com/android/tools/r8/compilerapi/startupprofile/StartupProfileApiTest.java
+++ b/src/test/java/com/android/tools/r8/compilerapi/startupprofile/StartupProfileApiTest.java
@@ -31,7 +31,6 @@
 import com.android.tools.r8.utils.codeinspector.CodeInspector;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -119,7 +118,7 @@
           // Create parser and parse ART profile.
           List<ClassReference> seenClasses = new ArrayList<>();
           startupProfileBuilder.addHumanReadableARTProfile(
-              new InputStreamReader(inputStream),
+              new UTF8TextInputStream(inputStream),
               parserBuilder ->
                   parserBuilder.setRulePredicate(
                       new ARTProfileRulePredicate() {

src/test/java/com/android/tools/r8/utils/UTF8TextInputStream.java

diff --git a/src/test/java/com/android/tools/r8/utils/UTF8TextInputStream.java b/src/test/java/com/android/tools/r8/utils/UTF8TextInputStream.java
new file mode 100644
index 0000000..1764dcc
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/utils/UTF8TextInputStream.java
@@ -0,0 +1,29 @@
+// Copyright (c) 2022, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.utils;
+
+import com.android.tools.r8.TextInputStream;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+public class UTF8TextInputStream implements TextInputStream {
+
+  private final InputStream inputStream;
+
+  public UTF8TextInputStream(InputStream inputStream) {
+    this.inputStream = inputStream;
+  }
+
+  @Override
+  public InputStream getInputStream() {
+    return inputStream;
+  }
+
+  @Override
+  public Charset getCharset() {
+    return StandardCharsets.UTF_8;
+  }
+}