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

base/android/java/src/org/chromium/base/BaseChromiumApplication.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.base;
 
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.Window;
 
-import org.chromium.base.multidex.ChromiumMultiDexInstaller;
+import org.chromium.base.multidex.ChromiumMultiDex;
 
 /**
  * Basic application functionality that should be shared among all browser applications.
  */
 public class BaseChromiumApplication extends Application {
 
     private static final String TAG = "cr.base";
     private final boolean mShouldInitializeApplicationStatusTracking;
 
     public BaseChromiumApplication() {
         this(true);
     }
 
     protected BaseChromiumApplication(boolean shouldInitializeApplicationStatusTracking) {
         mShouldInitializeApplicationStatusTracking = shouldInitializeApplicationStatusTracking;
     }
 
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(base);
-        ChromiumMultiDexInstaller.install(this);
+        ChromiumMultiDex.install(this);
     }
 
     /**
      * Interface to be implemented by listeners for window focus events.
      */
     public interface WindowFocusChangedListener {
         /**
          * Called when the window focus changes for {@code activity}.
          * @param activity The {@link Activity} that has a window focus changed event.
          * @param hasFocus Whether or not {@code activity} gained or lost focus.
@@ skipping 82 matching lines @@
                 assert activity.getWindow().getCallback() instanceof WindowCallbackWrapper;
             }
 
             @Override
             public void onActivityStopped(Activity activity) {
                 assert activity.getWindow().getCallback() instanceof WindowCallbackWrapper;
             }
         });
     }
 }