| Index: content/public/android/java/src/org/chromium/content/browser/BaseChildProcessConnection.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/BaseChildProcessConnection.java b/content/public/android/java/src/org/chromium/content/browser/BaseChildProcessConnection.java
|
| index c719dd774b3d196b6de36af09120c6708c3e5978..487ed3417fb2c743c1672dfe99aa404bb31b0bd2 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/BaseChildProcessConnection.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/BaseChildProcessConnection.java
|
| @@ -74,7 +74,7 @@ public abstract class BaseChildProcessConnection {
|
|
|
| /** Used to create specialization connection instances. */
|
| interface Factory {
|
| - BaseChildProcessConnection create(Context context, int number, boolean sandboxed,
|
| + BaseChildProcessConnection create(Context context, boolean sandboxed,
|
| DeathCallback deathCallback, String serviceClassName,
|
| Bundle childProcessCommonParameters, ChildProcessCreationParams creationParams);
|
| }
|
| @@ -162,7 +162,6 @@ public abstract class BaseChildProcessConnection {
|
| // TODO(mnaganov): Get rid of it after the release of the next Android SDK.
|
| private static Boolean sNeedsExtrabindFlags[] = new Boolean[2];
|
| private final Context mContext;
|
| - private final int mServiceNumber;
|
| private final boolean mSandboxed;
|
| private final BaseChildProcessConnection.DeathCallback mDeathCallback;
|
| private final ComponentName mServiceName;
|
| @@ -216,17 +215,16 @@ public abstract class BaseChildProcessConnection {
|
| // Process ID of the corresponding child process.
|
| private int mPid;
|
|
|
| - protected BaseChildProcessConnection(Context context, int number, boolean sandboxed,
|
| + protected BaseChildProcessConnection(Context context, boolean sandboxed,
|
| DeathCallback deathCallback, String serviceClassName,
|
| Bundle childProcessCommonParameters, ChildProcessCreationParams creationParams) {
|
| assert LauncherThread.runningOnLauncherThread();
|
| mContext = context;
|
| - mServiceNumber = number;
|
| mSandboxed = sandboxed;
|
| mDeathCallback = deathCallback;
|
| String packageName =
|
| creationParams != null ? creationParams.getPackageName() : context.getPackageName();
|
| - mServiceName = new ComponentName(packageName, serviceClassName + mServiceNumber);
|
| + mServiceName = new ComponentName(packageName, serviceClassName);
|
| mChildProcessCommonParameters = childProcessCommonParameters;
|
| mCreationParams = creationParams;
|
| }
|
| @@ -236,11 +234,6 @@ public abstract class BaseChildProcessConnection {
|
| return mContext;
|
| }
|
|
|
| - public final int getServiceNumber() {
|
| - assert LauncherThread.runningOnLauncherThread();
|
| - return mServiceNumber;
|
| - }
|
| -
|
| public final boolean isSandboxed() {
|
| assert LauncherThread.runningOnLauncherThread();
|
| return mSandboxed;
|
|
|