[Android] Move CommandLine.java to base

content/public/android/javatests/src/org/chromium/content/browser/ContentCommandLineTest.java

Index: content/public/android/javatests/src/org/chromium/content/browser/ContentCommandLineTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/CommandLineTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentCommandLineTest.java
similarity index 74%
rename from content/public/android/javatests/src/org/chromium/content/browser/CommandLineTest.java
rename to content/public/android/javatests/src/org/chromium/content/browser/ContentCommandLineTest.java
index 96015f9129206789fc2c9e4aac007fe104676b1b..d3e046e5599fed5d2c50cb24f129d7285ae52cb4 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/CommandLineTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentCommandLineTest.java
@@ -8,14 +8,14 @@ import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import org.chromium.base.CommandLine;
 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_apk.ContentShellActivity;
 import org.chromium.content_shell_apk.ContentShellApplication;
 
-public class CommandLineTest extends InstrumentationTestCase {
+public class ContentCommandLineTest 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",
@@ -102,22 +102,6 @@ public class CommandLineTest extends InstrumentationTestCase {
         assertTrue(CL_ADDED_VALUE_2.equals(cl.getSwitchValue(CL_ADDED_SWITCH_2)));
     }
 
-    void checkTokenizer(String[] expected, String toParse) {
-        String[] actual = CommandLine.tokenizeQuotedAruments(toParse.toCharArray());
-        assertEquals(expected.length, actual.length);
-        for (int i = 0; i < expected.length; ++i) {
-            assertEquals("comparing element " + i, expected[i], actual[i]);
-        }
-    }
-
-    @SmallTest
-    @Feature({"Android-AppBase"})
-    public void testJavaInitialization() {
-        CommandLine.init(INIT_SWITCHES);
-        checkInitSwitches();
-        checkSettingThenGetting();
-    }
-
     @MediumTest
     @Feature({"Android-AppBase"})
     public void testJavaNativeTransition() {
@@ -152,43 +136,6 @@ public class CommandLineTest extends InstrumentationTestCase {
         checkSettingThenGetting();
     }
 
-    @SmallTest
-    @Feature({"Android-AppBase"})
-    public void testBufferInitialization() {
-        CommandLine.init(CommandLine.tokenizeQuotedAruments(INIT_SWITCHES_BUFFER));
-        checkInitSwitches();
-        checkSettingThenGetting();
-    }
-
-    @SmallTest
-    @Feature({"Android-AppBase"})
-    public void testArgumentTokenizer() {
-        String toParse = " a\"\\bc de\\\"f g\"\\h ij    k\" \"lm";
-        String[] expected = { "a\\bc de\"f g\\h",
-                              "ij",
-                              "k lm" };
-        checkTokenizer(expected, toParse);
-
-        toParse = "";
-        expected = new String[0];
-        checkTokenizer(expected, toParse);
-
-        toParse = " \t\n";
-        checkTokenizer(expected, toParse);
-
-        toParse = " \"a'b\" 'c\"d' \"e\\\"f\" 'g\\'h' \"i\\'j\" 'k\\\"l'" +
-                  " m\"n\\'o\"p q'r\\\"s't";
-        expected = new String[] { "a'b",
-                                  "c\"d",
-                                  "e\"f",
-                                  "g'h",
-                                  "i\\'j",
-                                  "k\\\"l",
-                                  "mn\\'op",
-                                  "qr\\\"st",};
-        checkTokenizer(expected, toParse);
-    }
-
     @MediumTest
     @Feature({"Android-AppBase"})
     public void testFileInitialization() {