Removed the service number member from BaseChildProcessConnection.

content/public/android/java/src/org/chromium/content/browser/ManagedChildProcessConnection.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.content.Context;
 import android.os.Bundle;
 
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.process_launcher.ChildProcessCreationParams;
 
 /**
  * ManagedChildProcessConnection is a connection to a child service that can hold several bindings
  * to the service so it can be more or less agressively protected against OOM.
  * Accessed from the launcher thread. (but for isOomProtectedOrWasWhenDied()).
  */
 public class ManagedChildProcessConnection extends BaseChildProcessConnection {
     private static final String TAG = "ManChildProcessConn";
 
     public static final Factory FACTORY = new BaseChildProcessConnection.Factory() {
         @Override
-        public BaseChildProcessConnection create(Context context, int number, boolean sandboxed,
+        public BaseChildProcessConnection create(Context context, boolean sandboxed,
                 DeathCallback deathCallback, String serviceClassName,
                 Bundle childProcessCommonParameters, ChildProcessCreationParams creationParams) {
             assert LauncherThread.runningOnLauncherThread();
-            return new ManagedChildProcessConnection(context, number, sandboxed, deathCallback,
+            return new ManagedChildProcessConnection(context, sandboxed, deathCallback,
                     serviceClassName, childProcessCommonParameters, creationParams);
         }
     };
 
     // Initial binding protects the newly spawned process from being killed before it is put to use,
     // it is maintained between calls to start() and removeInitialBinding().
     private final ChildServiceConnection mInitialBinding;
 
     // Strong binding will make the service priority equal to the priority of the activity. We want
     // the OS to be able to kill background renderers as it kills other background apps, so strong
@@ skipping 14 matching lines @@
     private final ChildServiceConnection mModerateBinding;
 
     // Indicates whether the connection is OOM protected (if the connection is unbound, it contains
     // the state at time of unbinding).
     private boolean mOomProtected;
 
     // Set to true once unbind() was called.
     private boolean mUnbound;
 
     @VisibleForTesting
-    ManagedChildProcessConnection(Context context, int number, boolean sandboxed,
-            DeathCallback deathCallback, String serviceClassName,
-            Bundle childProcessCommonParameters, ChildProcessCreationParams creationParams) {
-        super(context, number, sandboxed, deathCallback, serviceClassName,
-                childProcessCommonParameters, creationParams);
+    ManagedChildProcessConnection(Context context, boolean sandboxed, DeathCallback deathCallback,
+            String serviceClassName, Bundle childProcessCommonParameters,
+            ChildProcessCreationParams creationParams) {
+        super(context, sandboxed, deathCallback, serviceClassName, childProcessCommonParameters,
+                creationParams);
 
         int initialFlags = Context.BIND_AUTO_CREATE;
         int extraBindFlags = shouldBindAsExportedService() ? Context.BIND_EXTERNAL_SERVICE : 0;
         mInitialBinding = createServiceConnection(initialFlags | extraBindFlags);
         mStrongBinding = createServiceConnection(
                 Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT | extraBindFlags);
         mWaivedBinding = createServiceConnection(
                 Context.BIND_AUTO_CREATE | Context.BIND_WAIVE_PRIORITY | extraBindFlags);
         mModerateBinding = createServiceConnection(Context.BIND_AUTO_CREATE | extraBindFlags);
     }
@@ skipping 110 matching lines @@
         mModerateBinding.unbind();
     }
 
     // Should be called every time the mInitialBinding or mStrongBinding are bound/unbound.
     private void updateOomProtectedState() {
         if (!mUnbound) {
             mOomProtected = mInitialBinding.isBound() || mStrongBinding.isBound();
         }
     }
 }