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.ComponentName; | 7 import android.content.ComponentName; |
8 import android.content.Context; | 8 import android.content.Context; |
9 import android.content.Intent; | 9 import android.content.Intent; |
10 import android.content.ServiceConnection; | 10 import android.content.ServiceConnection; |
11 import android.os.Handler; | 11 import android.os.Handler; |
12 import android.os.IBinder; | 12 import android.os.IBinder; |
13 import android.os.Looper; | 13 import android.os.Looper; |
14 import android.os.Message; | 14 import android.os.Message; |
15 import android.os.Messenger; | 15 import android.os.Messenger; |
16 import android.os.RemoteException; | 16 import android.os.RemoteException; |
17 import android.support.test.InstrumentationRegistry; | 17 import android.support.test.InstrumentationRegistry; |
18 import android.support.test.filters.MediumTest; | 18 import android.support.test.filters.MediumTest; |
19 | 19 |
20 import org.junit.Assert; | 20 import org.junit.Assert; |
21 import org.junit.Before; | 21 import org.junit.Before; |
22 import org.junit.Test; | 22 import org.junit.Test; |
23 import org.junit.runner.RunWith; | 23 import org.junit.runner.RunWith; |
24 | 24 |
25 import org.chromium.base.BaseSwitches; | 25 import org.chromium.base.BaseSwitches; |
26 import org.chromium.base.ThreadUtils; | 26 import org.chromium.base.ThreadUtils; |
27 import org.chromium.base.library_loader.LibraryLoader; | 27 import org.chromium.base.library_loader.LibraryLoader; |
28 import org.chromium.base.library_loader.LibraryProcessType; | 28 import org.chromium.base.library_loader.LibraryProcessType; |
| 29 import org.chromium.base.process_launcher.BaseChildProcessConnection; |
29 import org.chromium.base.process_launcher.ChildProcessCreationParams; | 30 import org.chromium.base.process_launcher.ChildProcessCreationParams; |
30 import org.chromium.base.process_launcher.FileDescriptorInfo; | 31 import org.chromium.base.process_launcher.FileDescriptorInfo; |
31 import org.chromium.base.test.util.Feature; | 32 import org.chromium.base.test.util.Feature; |
32 import org.chromium.content.browser.test.ChildProcessAllocatorSettings; | 33 import org.chromium.content.browser.test.ChildProcessAllocatorSettings; |
33 import org.chromium.content.browser.test.ContentJUnit4ClassRunner; | 34 import org.chromium.content.browser.test.ContentJUnit4ClassRunner; |
34 import org.chromium.content.browser.test.util.Criteria; | 35 import org.chromium.content.browser.test.util.Criteria; |
35 import org.chromium.content.browser.test.util.CriteriaHelper; | 36 import org.chromium.content.browser.test.util.CriteriaHelper; |
36 import org.chromium.content.common.ContentSwitches; | 37 import org.chromium.content.common.ContentSwitches; |
37 import org.chromium.content_shell_apk.ChildProcessLauncherTestHelperService; | 38 import org.chromium.content_shell_apk.ChildProcessLauncherTestHelperService; |
38 import org.chromium.content_shell_apk.ChildProcessLauncherTestUtils; | 39 import org.chromium.content_shell_apk.ChildProcessLauncherTestUtils; |
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
681 ChildProcessLauncherTestUtils.runOnLauncherThreadBlocking(new Runnable()
{ | 682 ChildProcessLauncherTestUtils.runOnLauncherThreadBlocking(new Runnable()
{ |
682 @Override | 683 @Override |
683 public void run() { | 684 public void run() { |
684 ChildProcessLauncher.triggerConnectionSetup(connection, sProcess
WaitArguments, | 685 ChildProcessLauncher.triggerConnectionSetup(connection, sProcess
WaitArguments, |
685 1 /* childProcessId */, new FileDescriptorInfo[0], | 686 1 /* childProcessId */, new FileDescriptorInfo[0], |
686 null /* launchCallback */, null /* childProcessCallback
*/); | 687 null /* launchCallback */, null /* childProcessCallback
*/); |
687 } | 688 } |
688 }); | 689 }); |
689 } | 690 } |
690 } | 691 } |
OLD | NEW |