Android: Make incremental install work for two <instrumentation>

build/android/incremental_install/java/org/chromium/incrementalinstall/BootstrapApplication.java

 // Copyright 2015 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.incrementalinstall;
 
 import android.app.Application;
 import android.app.Instrumentation;
 import android.content.ComponentName;
 import android.content.Context;
@@ skipping 14 matching lines @@
  * after side-loading its .so and .dex files from /data/local/tmp.
  *
  * This class is highly dependent on the private implementation details of
  * Android's ActivityThread.java. However, it has been tested to work with
  * JellyBean through Marshmallow.
  */
 public final class BootstrapApplication extends Application {
     private static final String TAG = "cr.incrementalinstall";
     private static final String MANAGED_DIR_PREFIX = "/data/local/tmp/incremental-app-";
     private static final String REAL_APP_META_DATA_NAME = "incremental-install-real-app";
-    private static final String REAL_INSTRUMENTATION_META_DATA_NAME =
-            "incremental-install-real-instrumentation";
+    private static final String REAL_INSTRUMENTATION_META_DATA_NAME0 =
+            "incremental-install-real-instrumentation-0";
+    private static final String REAL_INSTRUMENTATION_META_DATA_NAME1 =
+            "incremental-install-real-instrumentation-1";
 
     private ClassLoaderPatcher mClassLoaderPatcher;
     private Application mRealApplication;
     private Instrumentation mOrigInstrumentation;
     private Instrumentation mRealInstrumentation;
     private Object mStashedProviderList;
     private Object mActivityThread;
 
     @Override
     protected void attachBaseContext(Context context) {
@@ skipping 59 matching lines @@
             if (isFirstRun && mClassLoaderPatcher.mIsPrimaryProcess) {
                 LockFile.clearInstallerLock(appFirstRunLockFile);
                 if (instPackageNameDiffers) {
                     LockFile.clearInstallerLock(instFirstRunLockFile);
                 }
             }
 
             // mInstrumentationAppDir is one of a set of fields that is initialized only when
             // instrumentation is active.
             if (Reflect.getField(mActivityThread, "mInstrumentationAppDir") != null) {
-                String realInstrumentationName =
-                        getClassNameFromMetadata(REAL_INSTRUMENTATION_META_DATA_NAME, instContext);
-                initInstrumentation(realInstrumentationName);
+                String metaDataName = REAL_INSTRUMENTATION_META_DATA_NAME0;
+                if (mOrigInstrumentation instanceof SecondInstrumentation) {
+                    metaDataName = REAL_INSTRUMENTATION_META_DATA_NAME1;
+                }
+                initInstrumentation(getClassNameFromMetadata(metaDataName, instContext));
             } else {
                 Log.i(TAG, "No instrumentation active.");
             }
 
             // Even when instrumentation is not enabled, ActivityThread uses a default
             // Instrumentation instance internally. We hook it here in order to hook into the
             // call to Instrumentation.onCreate().
             Reflect.setField(mActivityThread, "mInstrumentation",
                     new BootstrapInstrumentation(this));
 
@@ skipping 144 matching lines @@
             for (Map.Entry<String, WeakReference<?>> entry : packageMap.entrySet()) {
                 Object loadedApk = entry.getValue().get();
                 if (loadedApk != null && Reflect.getField(loadedApk, "mApplication") == this) {
                     Reflect.setField(loadedApk, "mApplication", mRealApplication);
                     Reflect.setField(mRealApplication, "mLoadedApk", loadedApk);
                 }
             }
         }
     }
 }