Add apk for running content_browsertests

content/public/android/javatests/src/org/chromium/content/browser/ContentViewTestBase.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.browser;
 
 import android.util.Log;
 
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
-import org.chromium.content_shell.ContentShellActivity;
 import org.chromium.content_shell.ContentShellTestBase;
+import org.chromium.content_shell_apk.ContentShellActivity;
 
 public class ContentViewTestBase extends ContentShellTestBase {
 
     protected TestCallbackHelperContainer mTestCallbackHelperContainer;
 
     /**
      * Sets up the ContentView and injects the supplied object. Intended to be called from setUp().
      */
     protected void setUpContentView(final Object object, final String name) throws Exception {
         // This starts the activity, so must be called on the test thread.
@@ skipping 27 matching lines @@
     /**
      * Loads data on the UI thread and blocks until onPageFinished is called.
      * TODO(cramya): Move method to a separate util file once UiUtils.java moves into base.
      */
     protected void loadDataSync(final ContentView contentView, final String data,
             final String mimeType, final boolean isBase64Encoded) throws Throwable {
         loadUrl(contentView, mTestCallbackHelperContainer, LoadUrlParams.createLoadDataParams(
                 data, mimeType, isBase64Encoded));
     }
 }