Relanding "Add apk for running content_browsertests"

content/shell/android/javatests/src/org/chromium/content_shell/ContentShellTestBase.java

 // Copyright (c) 2012 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.content_shell;
 
 import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
 import android.test.ActivityInstrumentationTestCase2;
 import android.text.TextUtils;
 
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.LoadUrlParams;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
+import org.chromium.content_shell_apk.ContentShellActivity;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Base test class for all ContentShell based tests.
  */
 public class ContentShellTestBase extends ActivityInstrumentationTestCase2<ContentShellActivity> {
 
     /** The maximum time the waitForActiveShellToBeDoneLoading method will wait. */
@@ skipping 147 matching lines @@
      * @param action The action to be performed on the UI thread.
      */
     protected void handleBlockingCallbackAction(
             CallbackHelper callbackHelper, Runnable action) throws Throwable {
         int currentCallCount = callbackHelper.getCallCount();
         runTestOnUiThread(action);
         callbackHelper.waitForCallback(
                 currentCallCount, 1, WAIT_PAGE_LOADING_TIMEOUT_SECONDS, TimeUnit.SECONDS);
     }
 }