Update expectation in PackagePrivateNonOverridePublicizerTest

Change-Id: I2ef2c775618ea64471441addabed83ceb3bb9f69

src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateNonOverridePublicizerTest.java

diff --git a/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateNonOverridePublicizerTest.java b/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateNonOverridePublicizerTest.java
index b4cc748..fa7e479 100644
--- a/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateNonOverridePublicizerTest.java
+++ b/src/test/java/com/android/tools/r8/accessrelaxation/PackagePrivateNonOverridePublicizerTest.java
@@ -5,7 +5,6 @@
 package com.android.tools.r8.accessrelaxation;
 
 import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
-import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 
@@ -14,7 +13,6 @@
 import com.android.tools.r8.NoVerticalClassMerging;
 import com.android.tools.r8.TestBase;
 import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.TestRunResult;
 import com.android.tools.r8.TestShrinkerBuilder;
 import com.android.tools.r8.resolution.virtualtargets.package_a.ViewModel;
 import com.android.tools.r8.utils.BooleanUtils;
@@ -50,7 +48,7 @@
     testForRuntime(parameters)
         .addProgramClasses(ViewModel.class, SubViewModel.class, Main.class)
         .run(parameters.getRuntime(), Main.class)
-        .apply(this::assertSuccessOutput);
+        .assertSuccessWithOutputLines(EXPECTED);
   }
 
   @Test
@@ -64,7 +62,7 @@
         .enableNoVerticalClassMergingAnnotations()
         .applyIf(allowAccessModification, TestShrinkerBuilder::allowAccessModification)
         .run(parameters.getRuntime(), Main.class)
-        .apply(this::assertSuccessOutput)
+        .assertSuccessWithOutputLines(EXPECTED)
         .inspect(
             inspector -> {
               ClassSubject clazz = inspector.clazz(ViewModel.class);
@@ -78,14 +76,6 @@
             });
   }
 
-  private void assertSuccessOutput(TestRunResult<?> result) {
-    if (parameters.isDexRuntime() && parameters.getDexRuntimeVersion().isDalvik()) {
-      result.assertFailureWithErrorThatMatches(containsString("overrides final"));
-    } else {
-      result.assertSuccessWithOutputLines(EXPECTED);
-    }
-  }
-
   @NeverClassInline
   @NoVerticalClassMerging
   public static class SubViewModel extends ViewModel {