| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.content.browser; | 5 package org.chromium.content.browser; |
| 6 | 6 |
| 7 import android.content.Context; | 7 import android.content.Context; |
| 8 import android.os.RemoteException; | 8 import android.os.RemoteException; |
| 9 import android.test.InstrumentationTestCase; | 9 import android.test.InstrumentationTestCase; |
| 10 import android.test.suitebuilder.annotation.MediumTest; | 10 import android.test.suitebuilder.annotation.MediumTest; |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 | 240 |
| 241 private void triggerConnectionSetup(ChildProcessConnectionImpl connection) { | 241 private void triggerConnectionSetup(ChildProcessConnectionImpl connection) { |
| 242 ChildProcessLauncher.triggerConnectionSetup(connection, sProcessWaitArgu
ments, 1, | 242 ChildProcessLauncher.triggerConnectionSetup(connection, sProcessWaitArgu
ments, 1, |
| 243 new FileDescriptorInfo[0], ChildProcessLauncher.CALLBACK_FOR_REN
DERER_PROCESS, 0); | 243 new FileDescriptorInfo[0], ChildProcessLauncher.CALLBACK_FOR_REN
DERER_PROCESS, 0); |
| 244 } | 244 } |
| 245 | 245 |
| 246 @Override | 246 @Override |
| 247 protected void setUp() throws Exception { | 247 protected void setUp() throws Exception { |
| 248 super.setUp(); | 248 super.setUp(); |
| 249 LibraryLoader.get(LibraryProcessType.PROCESS_CHILD) | 249 LibraryLoader.get(LibraryProcessType.PROCESS_CHILD) |
| 250 .ensureInitialized(getInstrumentation().getTargetContext()); | 250 .ensureInitialized(getInstrumentation().getContext()); |
| 251 } | 251 } |
| 252 } | 252 } |
| OLD | NEW |