| 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.support.test.filters.MediumTest; |
| 9 import android.test.InstrumentationTestCase; | 10 import android.test.InstrumentationTestCase; |
| 10 import android.test.suitebuilder.annotation.MediumTest; | |
| 11 | 11 |
| 12 import org.chromium.base.BaseSwitches; | 12 import org.chromium.base.BaseSwitches; |
| 13 import org.chromium.base.library_loader.LibraryLoader; | 13 import org.chromium.base.library_loader.LibraryLoader; |
| 14 import org.chromium.base.library_loader.LibraryProcessType; | 14 import org.chromium.base.library_loader.LibraryProcessType; |
| 15 import org.chromium.base.test.util.CommandLineFlags; | 15 import org.chromium.base.test.util.CommandLineFlags; |
| 16 import org.chromium.base.test.util.Feature; | 16 import org.chromium.base.test.util.Feature; |
| 17 import org.chromium.content.browser.test.util.Criteria; | 17 import org.chromium.content.browser.test.util.Criteria; |
| 18 import org.chromium.content.browser.test.util.CriteriaHelper; | 18 import org.chromium.content.browser.test.util.CriteriaHelper; |
| 19 import org.chromium.content.common.FileDescriptorInfo; | 19 import org.chromium.content.common.FileDescriptorInfo; |
| 20 | 20 |
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 private ChildProcessCreationParams getDefaultChildProcessCreationParams(Stri
ng packageName) { | 338 private ChildProcessCreationParams getDefaultChildProcessCreationParams(Stri
ng packageName) { |
| 339 return new ChildProcessCreationParams(packageName, false /* isExternalSe
rvice */, | 339 return new ChildProcessCreationParams(packageName, false /* isExternalSe
rvice */, |
| 340 LibraryProcessType.PROCESS_CHILD); | 340 LibraryProcessType.PROCESS_CHILD); |
| 341 } | 341 } |
| 342 | 342 |
| 343 private void triggerConnectionSetup(ChildProcessConnectionImpl connection) { | 343 private void triggerConnectionSetup(ChildProcessConnectionImpl connection) { |
| 344 ChildProcessLauncher.triggerConnectionSetup(connection, sProcessWaitArgu
ments, 1, | 344 ChildProcessLauncher.triggerConnectionSetup(connection, sProcessWaitArgu
ments, 1, |
| 345 new FileDescriptorInfo[0], ChildProcessLauncher.CALLBACK_FOR_REN
DERER_PROCESS, 0); | 345 new FileDescriptorInfo[0], ChildProcessLauncher.CALLBACK_FOR_REN
DERER_PROCESS, 0); |
| 346 } | 346 } |
| 347 } | 347 } |
| OLD | NEW |