Adding a new annotation to set ChildProcessAllocator settings in tests.

chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.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.chrome.test;
 
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.BaseChromiumInstrumentationTestRunner;
 import org.chromium.base.test.BaseTestResult;
 import org.chromium.base.test.util.DisableIfSkipCheck;
 import org.chromium.base.test.util.RestrictionSkipCheck;
 import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.vr_shell.VrClassesWrapper;
 import org.chromium.chrome.browser.vr_shell.VrDaydreamApi;
 import org.chromium.chrome.test.util.ChromeDisableIf;
 import org.chromium.chrome.test.util.ChromeRestriction;
+import org.chromium.content.browser.test.ContentInstrumentationTestRunner;
 import org.chromium.policy.test.annotations.Policies;
 import org.chromium.ui.base.DeviceFormFactor;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
 
 /**
  *  An Instrumentation test runner that optionally spawns a test HTTP server.
  *  The server's root directory is the device's external storage directory.
  */
-public class ChromeInstrumentationTestRunner extends BaseChromiumInstrumentationTestRunner {
-
+public class ChromeInstrumentationTestRunner extends ContentInstrumentationTestRunner {
     private static final String TAG = "ChromeInstrumentationTestRunner";
 
     @Override
     public void onCreate(Bundle arguments) {
         super.onCreate(arguments);
     }
 
     @Override
     protected void addTestHooks(BaseTestResult result) {
         super.addTestHooks(result);
@@ skipping 150 matching lines @@
                 return true;
             }
             if (TextUtils.equals(type, ChromeDisableIf.LARGETABLET)
                     && DeviceFormFactor.isLargeTablet(mTargetContext)) {
                 return true;
             }
             return false;
         }
     }
 }