| Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java
|
| diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java
|
| index b4528edd2e741f53fa11443ca7756c5fd4c5e237..7a5d4bba156092e5cfc48fe8a78982d903e3b18a 100644
|
| --- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java
|
| +++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java
|
| @@ -6,6 +6,7 @@ package org.chromium.content.browser.test;
|
|
|
| import android.test.InstrumentationTestCase;
|
|
|
| +import org.chromium.base.PathUtils;
|
| import org.chromium.base.ThreadUtils;
|
| import org.chromium.base.library_loader.LibraryLoader;
|
| import org.chromium.base.library_loader.LibraryProcessType;
|
| @@ -17,6 +18,8 @@ import org.chromium.content.browser.test.util.ApplicationUtils;
|
| * Test extension that adds support for loading and dealing with native libraries.
|
| */
|
| public class NativeLibraryTestBase extends InstrumentationTestCase {
|
| + private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "content";
|
| +
|
| /**
|
| * Loads the native library on the activity UI thread (must not be called from the UI thread).
|
| */
|
| @@ -35,6 +38,9 @@ public class NativeLibraryTestBase extends InstrumentationTestCase {
|
| private void handleNativeInitialization(final boolean initBrowserProcess) {
|
| assertFalse(ThreadUtils.runningOnUiThread());
|
|
|
| + PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX,
|
| + getInstrumentation().getTargetContext());
|
| +
|
| try {
|
| ApplicationUtils.waitForLibraryDependencies(getInstrumentation());
|
| } catch (InterruptedException e) {
|
|
|