[Android] Move CommandLine.java to base

chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellTestBase.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.chrome.testshell;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.test.ActivityInstrumentationTestCase2;
 import android.text.TextUtils;
 
+import org.chromium.base.CommandLine;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.test.util.ApplicationData;
 import org.chromium.content.browser.BrowserStartupController;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
-import org.chromium.content.common.CommandLine;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Base test class for all ChromiumTestShell based tests.
  */
 public class ChromiumTestShellTestBase extends
         ActivityInstrumentationTestCase2<ChromiumTestShellActivity> {
     /** The maximum time the waitForActiveShellToBeDoneLoading method will wait. */
     private static final long WAIT_FOR_ACTIVE_SHELL_LOADING_TIMEOUT = 10000;
@@ skipping 90 matching lines @@
     public void loadUrlWithSanitization(final String url) throws InterruptedException {
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 getActivity().getActiveTab().loadUrlWithSanitization(url);
             }
         });
         waitForActiveShellToBeDoneLoading();
     }
 }