Update from https://crrev.com/302630

base/android/javatests/src/org/chromium/base/LibraryLoaderHelperTest.java

Index: base/android/javatests/src/org/chromium/base/LibraryLoaderHelperTest.java
diff --git a/base/android/javatests/src/org/chromium/base/LibraryLoaderHelperTest.java b/base/android/javatests/src/org/chromium/base/LibraryLoaderHelperTest.java
index 85f4c77baf1f4101a71cb7786def58bfe412d9a8..6abdb8910b2b14c9cf32d6dfba30b6bb61e7a434 100644
--- a/base/android/javatests/src/org/chromium/base/LibraryLoaderHelperTest.java
+++ b/base/android/javatests/src/org/chromium/base/LibraryLoaderHelperTest.java
@@ -21,7 +21,8 @@ public class LibraryLoaderHelperTest extends InstrumentationTestCase {
     @Override
     public void setUp() throws Exception {
         Context context = getInstrumentation().getTargetContext();
-        LibraryLoaderHelper.deleteWorkaroundLibrariesSynchronously(context);
+        LibraryLoaderHelper.deleteLibrariesSynchronously(
+                context, LibraryLoaderHelper.PACKAGE_MANAGER_WORKAROUND_DIR);
     }
 
     @MediumTest
@@ -30,13 +31,13 @@ public class LibraryLoaderHelperTest extends InstrumentationTestCase {
             @Override
             public void run() {
                 Context context = getInstrumentation().getTargetContext();
-                File libDir = LibraryLoaderHelper.getWorkaroundLibDir(context);
+                File libDir = LibraryLoaderHelper.getLibDir(context,
+                        LibraryLoaderHelper.PACKAGE_MANAGER_WORKAROUND_DIR);
                 assertTrue(libDir.exists());
                 assertTrue(libDir.isDirectory());
                 assertEquals(libDir.list().length, 0);
 
-                assertTrue(
-                    LibraryLoaderHelper.loadNativeLibrariesUsingWorkaroundForTesting(
+                assertTrue(LibraryLoaderHelper.loadNativeLibrariesUsingWorkaroundForTesting(
                         context));
 
                 assertTrue(libDir.list().length > 0);
@@ -47,7 +48,8 @@ public class LibraryLoaderHelperTest extends InstrumentationTestCase {
     @Override
     public void tearDown() throws Exception {
         Context context = getInstrumentation().getTargetContext();
-        LibraryLoaderHelper.deleteWorkaroundLibrariesSynchronously(context);
+        LibraryLoaderHelper.deleteLibrariesSynchronously(
+                context, LibraryLoaderHelper.PACKAGE_MANAGER_WORKAROUND_DIR);
         super.tearDown();
     }
 }