Rename pollForCriteria to pollForTestThreadCriteria.

content/public/android/javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.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 android.content.Context;
 import android.os.RemoteException;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ skipping 27 matching lines @@
         assertEquals(0, ChildProcessLauncher.allocatedConnectionsCountForTesting(appContext));
         assertEquals(0, ChildProcessLauncher.connectedServicesCountForTesting());
 
         // Try to allocate a connection to service class in incorrect package. We can do that by
         // using the instrumentation context (getContext()) instead of the app context
         // (getTargetContext()).
         Context context = getInstrumentation().getContext();
         ChildProcessLauncher.allocateBoundConnectionForTesting(context);
 
         // Verify that the connection is not considered as allocated.
-        CriteriaHelper.pollForCriteria(Criteria.equals(0, new Callable<Integer>() {
+        CriteriaHelper.pollInstrumentationThread(Criteria.equals(0, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return ChildProcessLauncher.allocatedConnectionsCountForTesting(
                         appContext);
             }
         }));
 
-        CriteriaHelper.pollForCriteria(Criteria.equals(0, new Callable<Integer>() {
+        CriteriaHelper.pollInstrumentationThread(Criteria.equals(0, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return ChildProcessLauncher.connectedServicesCountForTesting();
             }
         }));
     }
 
     /**
      * Tests cleanup for a connection that terminates before setup.
      */
     @MediumTest
     @Feature({"ProcessManagement"})
     public void testServiceCrashedBeforeSetup() throws InterruptedException, RemoteException {
         final Context appContext = getInstrumentation().getTargetContext();
         assertEquals(0, ChildProcessLauncher.allocatedConnectionsCountForTesting(appContext));
         assertEquals(0, ChildProcessLauncher.connectedServicesCountForTesting());
 
         // Start and connect to a new service.
         final ChildProcessConnectionImpl connection = startConnection();
         assertEquals(1, ChildProcessLauncher.allocatedConnectionsCountForTesting(appContext));
 
         // Verify that the service is not yet set up.
         assertEquals(0, connection.getPid());
         assertEquals(0, ChildProcessLauncher.connectedServicesCountForTesting());
 
         // Crash the service.
         assertTrue(connection.crashServiceForTesting());
 
         // Verify that the connection gets cleaned-up.
-        CriteriaHelper.pollForCriteria(Criteria.equals(0, new Callable<Integer>() {
+        CriteriaHelper.pollInstrumentationThread(Criteria.equals(0, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return ChildProcessLauncher.allocatedConnectionsCountForTesting(
                         appContext);
             }
         }));
 
-        CriteriaHelper.pollForCriteria(Criteria.equals(0, new Callable<Integer>() {
+        CriteriaHelper.pollInstrumentationThread(Criteria.equals(0, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return ChildProcessLauncher.connectedServicesCountForTesting();
             }
         }));
     }
 
     /**
      * Tests cleanup for a connection that terminates after setup.
      */
     @MediumTest
     @Feature({"ProcessManagement"})
     public void testServiceCrashedAfterSetup() throws InterruptedException, RemoteException {
         final Context appContext = getInstrumentation().getTargetContext();
         assertEquals(0, ChildProcessLauncher.allocatedConnectionsCountForTesting(appContext));
 
         // Start and connect to a new service.
         final ChildProcessConnectionImpl connection = startConnection();
         assertEquals(1, ChildProcessLauncher.allocatedConnectionsCountForTesting(appContext));
 
         // Initiate the connection setup.
         triggerConnectionSetup(connection);
 
         // Verify that the connection completes the setup.
-        CriteriaHelper.pollForCriteria(Criteria.equals(1, new Callable<Integer>() {
+        CriteriaHelper.pollInstrumentationThread(Criteria.equals(1, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return ChildProcessLauncher.connectedServicesCountForTesting();
             }
         }));
 
-        CriteriaHelper.pollForCriteria(
+        CriteriaHelper.pollInstrumentationThread(
                 new Criteria("The connection failed to get a pid in setup.") {
                     @Override
                     public boolean isSatisfied() {
                         return connection.getPid() != 0;
                     }
                 });
 
         // Crash the service.
         assertTrue(connection.crashServiceForTesting());
 
         // Verify that the connection gets cleaned-up.
-        CriteriaHelper.pollForCriteria(Criteria.equals(0, new Callable<Integer>() {
+        CriteriaHelper.pollInstrumentationThread(Criteria.equals(0, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return ChildProcessLauncher.allocatedConnectionsCountForTesting(
                         appContext);
             }
         }));
 
-        CriteriaHelper.pollForCriteria(Criteria.equals(0, new Callable<Integer>() {
+        CriteriaHelper.pollInstrumentationThread(Criteria.equals(0, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return ChildProcessLauncher.connectedServicesCountForTesting();
             }
         }));
 
         // Verify that the connection pid remains set after termination.
         assertTrue(connection.getPid() != 0);
     }
 
@@ skipping 12 matching lines @@
 
         // Queue up a new spawn request. There is no way to kill the pending connection, leak it
         // until the browser restart.
         ChildProcessLauncher.enqueuePendingSpawnForTesting(appContext, sProcessWaitArguments);
         assertEquals(1, ChildProcessLauncher.pendingSpawnsCountForTesting());
 
         // Initiate the connection setup.
         triggerConnectionSetup(connection);
 
         // Verify that the connection completes the setup.
-        CriteriaHelper.pollForCriteria(
+        CriteriaHelper.pollInstrumentationThread(
                 Criteria.equals(1, new Callable<Integer>() {
                     @Override
                     public Integer call() {
                         return ChildProcessLauncher.connectedServicesCountForTesting();
                     }
                 }));
 
-        CriteriaHelper.pollForCriteria(
+        CriteriaHelper.pollInstrumentationThread(
                 new Criteria("The connection failed to get a pid in setup.") {
                     @Override
                     public boolean isSatisfied() {
                         return connection.getPid() != 0;
                     }
                 });
 
         // Crash the service.
         assertTrue(connection.crashServiceForTesting());
 
         // Verify that a new service is started for the pending spawn.
-        CriteriaHelper.pollForCriteria(Criteria.equals(0, new Callable<Integer>() {
+        CriteriaHelper.pollInstrumentationThread(Criteria.equals(0, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return ChildProcessLauncher.pendingSpawnsCountForTesting();
             }
         }));
 
-        CriteriaHelper.pollForCriteria(
+        CriteriaHelper.pollInstrumentationThread(
                 Criteria.equals(1, new Callable<Integer>() {
                     @Override
                     public Integer call() {
                         return ChildProcessLauncher.allocatedConnectionsCountForTesting(
                                 appContext);
                     }
                 }));
 
         // Verify that the connection completes the setup for the pending spawn.
-        CriteriaHelper.pollForCriteria(Criteria.equals(1, new Callable<Integer>() {
+        CriteriaHelper.pollInstrumentationThread(Criteria.equals(1, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return ChildProcessLauncher.connectedServicesCountForTesting();
             }
         }));
     }
 
     private ChildProcessConnectionImpl startConnection() throws InterruptedException {
         // Allocate a new connection.
         Context context = getInstrumentation().getTargetContext();
         final ChildProcessConnectionImpl connection = (ChildProcessConnectionImpl)
                 ChildProcessLauncher.allocateBoundConnectionForTesting(context);
 
         // Wait for the service to connect.
-        CriteriaHelper.pollForCriteria(new Criteria("The connection wasn't established.") {
-            @Override
-            public boolean isSatisfied() {
-                return connection.isConnected();
-            }
-        });
+        CriteriaHelper.pollInstrumentationThread(
+                new Criteria("The connection wasn't established.") {
+                    @Override
+                    public boolean isSatisfied() {
+                        return connection.isConnected();
+                    }
+                });
         return connection;
     }
 
     private void triggerConnectionSetup(ChildProcessConnectionImpl connection) {
         ChildProcessLauncher.triggerConnectionSetup(connection, sProcessWaitArguments, 1,
                 new FileDescriptorInfo[0], ChildProcessLauncher.CALLBACK_FOR_RENDERER_PROCESS, 0);
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         LibraryLoader.get(LibraryProcessType.PROCESS_CHILD)
                 .ensureInitialized(getInstrumentation().getContext());
     }
 }