| Index: content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java | 
| diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java | 
| index f68b76c81ad3c9d5dcd5f3cd7a81202d02bc54c6..81575989df0d355fbbcae8d1be5025240262682a 100644 | 
| --- a/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java | 
| +++ b/content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java | 
| @@ -33,6 +33,12 @@ public class ChildProcessLauncherTest extends InstrumentationTestCase { | 
| private static final String DEFAULT_SANDBOXED_PROCESS_SERVICE = | 
| "org.chromium.content.app.SandboxedProcessService"; | 
|  | 
| +    @Override | 
| +    protected void setUp() throws Exception { | 
| +        super.setUp(); | 
| +        LibraryLoader.get(LibraryProcessType.PROCESS_CHILD).ensureInitialized(); | 
| +    } | 
| + | 
| /** | 
| *  Tests cleanup for a connection that fails to connect in the first place. | 
| */ | 
| @@ -338,11 +344,4 @@ public class ChildProcessLauncherTest extends InstrumentationTestCase { | 
| ChildProcessLauncher.triggerConnectionSetup(connection, sProcessWaitArguments, 1, | 
| new FileDescriptorInfo[0], ChildProcessLauncher.CALLBACK_FOR_RENDERER_PROCESS, 0); | 
| } | 
| - | 
| -    @Override | 
| -    protected void setUp() throws Exception { | 
| -        super.setUp(); | 
| -        LibraryLoader.get(LibraryProcessType.PROCESS_CHILD) | 
| -                .ensureInitialized(getInstrumentation().getTargetContext()); | 
| -    } | 
| } | 
|  |