content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestHelperService.java - Issue 2874643002: Merging Managed and Important connection.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestHelperService.java

Issue 2874643002: Merging Managed and Important connection. (Closed)

Patch Set: Fix test + sync Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/public/android/junit/src/org/chromium/content/browser/BindingManagerImplTest.java ('k') | content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestUtils.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestHelperService.java

diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestHelperService.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestHelperService.java

index e5b52b8d399cc78395da10505eb146a918f94441..7687d332f1a2c5ef6147343aba19955c0d58d96f 100644

--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestHelperService.java

+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestHelperService.java

@@ -20,7 +20,7 @@ import org.chromium.base.library_loader.LibraryProcessType;

import org.chromium.base.library_loader.ProcessInitException;

import org.chromium.base.process_launcher.ChildProcessCreationParams;

import org.chromium.base.process_launcher.FileDescriptorInfo;

-import org.chromium.content.browser.BaseChildProcessConnection;

+import org.chromium.content.browser.ChildProcessConnection;

/**

* A Service that assists the ChildProcessLauncherTest that responds to one message, which

@@ -70,9 +70,8 @@ public class ChildProcessLauncherTestHelperService extends Service {

final boolean bindToCaller = true;

ChildProcessCreationParams params = new ChildProcessCreationParams(

getPackageName(), false, LibraryProcessType.PROCESS_CHILD, bindToCaller);

- final BaseChildProcessConnection conn =

- ChildProcessLauncherTestUtils.startInternalForTesting(

- this, commandLine, new FileDescriptorInfo[0], params);

+ final ChildProcessConnection conn = ChildProcessLauncherTestUtils.startInternalForTesting(

+ this, commandLine, new FileDescriptorInfo[0], params);

// Poll the connection until it is set up. The main test in ChildProcessLauncherTest, which

// has bound the connection to this service, manages the timeout via the lifetime of this