Use multidex capable application for chrome_public_test_apk.

chrome/test/android/javatests/src/org/chromium/chrome/test/TestContentProvider.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.
 
 /**
  * Content provider for testing content URLs.
  */
 
 package org.chromium.chrome.test;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.AbstractCursor;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
+import org.chromium.base.annotations.MainDex;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URLConnection;
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * Content provider for testing content:// urls.
  * Note: if you move this class, make sure you have also updated AndroidManifest.xml
@@ skipping 10 matching lines @@
  * requires declaring a sharedUserId between the Chrome apk and ChromePublicTestApk and
  * then setting the target process for ContentProvider for the instrumentation target package.
  *     android:process="{{manifest_package}}"
  *
  * Note that modifying the application manifest file could be problematic as Chrome has
  * side by side channels.
  *
  * The second one is moving the TestContentProvider to the ChromeTestSuport apk. This
  * seems a lot better path than above.
  */
+@MainDex
 public class TestContentProvider extends ContentProvider {
     private static final String ANDROID_DATA_FILE_PATH = "android/";
     private static final String AUTHORITY = "org.chromium.chrome.test.TestContentProvider";
     private static final String CONTENT_SCHEME = "content://";
     private static final String GET_RESOURCE_REQUEST_COUNT = "get_resource_request_count";
     private static final String RESET_RESOURCE_REQUEST_COUNTS = "reset_resource_request_counts";
     private static final String SET_DATA_PATH = "set_data_path";
     private static final String TAG = "TestContentProvider";
     private enum ColumnIndex {
         RESOURCE_REQUEST_COUNT_COLUMN,
@@ skipping 170 matching lines @@
                         ? mResourceRequestCount.get(resource) : 0);
             } else if (RESET_RESOURCE_REQUEST_COUNTS.equals(action)) {
                 mResourceRequestCount = new HashMap<String, Integer>();
             } else if (SET_DATA_PATH.equals(action)) {
                 mDataFilePath = resource;
             }
             return null;
         }
     }
 }