Revert of [Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND)

base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.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.base.test;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.test.AndroidTestRunner;
 import android.test.InstrumentationTestRunner;
 import android.text.TextUtils;
 
 import junit.framework.TestCase;
 import junit.framework.TestResult;
 
 import org.chromium.base.Log;
 import org.chromium.base.SysUtils;
-import org.chromium.base.multidex.ChromiumMultiDexInstaller;
+import org.chromium.base.multidex.ChromiumMultiDex;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisableIfSkipCheck;
 import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.SkipCheck;
 import org.chromium.test.reporter.TestStatusListener;
 
 import java.lang.reflect.Method;
 
 // TODO(jbudorick): Add support for on-device handling of timeouts.
 /**
  *  An Instrumentation test runner that checks SDK level for tests with specific requirements.
  */
 public class BaseInstrumentationTestRunner extends InstrumentationTestRunner {
     private static final String TAG = "base_test";
 
     @Override
     public void onCreate(Bundle arguments) {
-        ChromiumMultiDexInstaller.install(getTargetContext());
+        ChromiumMultiDex.install(getTargetContext());
         super.onCreate(arguments);
     }
 
     @Override
     protected AndroidTestRunner getAndroidTestRunner() {
         AndroidTestRunner runner = new AndroidTestRunner() {
             @Override
             protected TestResult createTestResult() {
                 BaseTestResult r = new BaseTestResult(BaseInstrumentationTestRunner.this);
                 addTestHooks(r);
@@ skipping 85 matching lines @@
                     Log.i(TAG, "Test " + testClass.getName() + "#" + testCase.getName()
                             + " is not enabled at SDK level " + Build.VERSION.SDK_INT
                             + ".");
                     return true;
                 }
             }
             return false;
         }
     }
 }