Removed the service number member from BaseChildProcessConnection.

content/public/android/junit/src/org/chromium/content/browser/BindingManagerImplTest.java

 // Copyright 2014 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 static android.content.ComponentCallbacks2.TRIM_MEMORY_RUNNING_CRITICAL;
 import static android.content.ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW;
 import static android.content.ComponentCallbacks2.TRIM_MEMORY_RUNNING_MODERATE;
 
@@ skipping 49 matching lines @@
 
     private static class TestChildProcessConnection extends ManagedChildProcessConnection {
         private final int mPid;
         private boolean mConnected;
 
         /**
          * Creates a mock binding corresponding to real ManagedChildProcessConnection after the
          * connection is established: with initial binding bound and no strong binding.
          */
         private TestChildProcessConnection(int pid) {
-            super(null /* context */, pid /* number */, true /* sandboxed */,
-                    null /* deathCallback */, null /* serviceClassName */,
-                    null /* childProcessCommonParameters */,
+            super(null /* context */, true /* sandboxed */, null /* deathCallback */,
+                    "TestService" /* serviceClassName */, null /* childProcessCommonParameters */,
                     new ChildProcessCreationParams("org.chromium.test",
                             false /* isExternalService */, 0 /* libraryProcessType */,
                             false /* bindToCallerCheck */));
             mPid = pid;
         }
 
         @Override
         public int getPid() {
             return mPid;
         }
@@ skipping 476 matching lines @@
             // Verify that each connection has a moderate binding after binding and releasing a
             // strong binding.
             for (TestChildProcessConnection connection : connections) {
                 manager.setInForeground(connection.getPid(), true);
                 manager.setInForeground(connection.getPid(), false);
                 ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
                 Assert.assertTrue(message, connection.isModerateBindingBound());
             }
 
             app.onTrimMemory(pair.first);
-            // Verify that some of moderate bindings drop.
+            // Verify that some of the moderate bindings have been dropped.
             for (int i = 0; i < connections.length; i++) {
                 Assert.assertEquals(
                         message, i >= pair.second, connections[i].isModerateBindingBound());
             }
         }
     }
 
     /**
      * Verifies that BindingManager.releaseAllModerateBindings() drops all the moderate bindings.
      */
@@ skipping 92 matching lines @@
 
         manager.onSentToBackground();
         ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
         Assert.assertFalse(connection.isModerateBindingBound());
 
         // Bringing Chrome to the foreground should not re-add the moderate bindings.
         manager.onBroughtToForeground();
         Assert.assertFalse(connection.isModerateBindingBound());
     }
 }