Add apk for running content_browsertests

content/public/android/javatests/src/org/chromium/content/browser/CommandLineTest.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.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.app.LibraryLoader;
 import org.chromium.content.common.CommandLine;
 import org.chromium.content.common.ProcessInitException;
-import org.chromium.content_shell.ContentShellActivity;
-import org.chromium.content_shell.ContentShellApplication;
+import org.chromium.content_shell_apk.ContentShellActivity;
+import org.chromium.content_shell_apk.ContentShellApplication;
 
 public class CommandLineTest extends InstrumentationTestCase {
     // A reference command line. Note that switch2 is [brea\d], switch3 is [and "butter"],
     // and switch4 is [a "quoted" 'food'!]
     static final String INIT_SWITCHES[] = { "init_command", "--SWITCH", "Arg",
         "--switch2=brea\\d", "--switch3=and \"butter\"",
         "--switch4=a \"quoted\" 'food'!",
         "--", "--actually_an_arg" };
 
     // The same command line, but in quoted string format.
@@ skipping 163 matching lines @@
     }
 
     @MediumTest
     @Feature({"Android-AppBase"})
     public void testFileInitialization() {
         CommandLine.initFromFile(ContentShellActivity.COMMAND_LINE_FILE);
         loadJni();
         checkSettingThenGetting();
     }
 }