[Android] Move CommandLine.java to base

content/public/android/javatests/src/org/chromium/content/browser/PhoneNumberDetectionTest.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.FlakyTest;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
 
+import org.chromium.base.CommandLine;
 import org.chromium.base.test.util.Feature;
-import org.chromium.content.common.CommandLine;
+import org.chromium.content.common.ContentSwitches;
 
 /**
  * Test suite for phone number detection.
  */
 public class PhoneNumberDetectionTest extends ContentDetectionTestBase {
 
     private static final String TELEPHONE_INTENT_PREFIX = "tel:";
 
     private boolean isExpectedTelephoneIntent(String intentUrl, String expectedContent) {
         if (intentUrl == null) return false;
         final String expectedUrl = TELEPHONE_INTENT_PREFIX + urlForContent(expectedContent);
         return intentUrl.equals(expectedUrl);
     }
 
     /**
      * Starts the content shell activity with the provided test URL and setting the local country
      * to the one provided by its 2-letter ISO code.
      * @param testUrl Test url to load.
      * @param countryIso 2-letter ISO country code. If set to null only international numbers
      *                   can be assumed to be supported.
      */
     private void startActivityWithTestUrlAndCountryIso(String testUrl, String countryIso)
             throws Throwable {
         final String[] cmdlineArgs = countryIso == null ? null : new String[] {
-                "--" + CommandLine.NETWORK_COUNTRY_ISO + "=" + countryIso };
+                "--" + ContentSwitches.NETWORK_COUNTRY_ISO + "=" + countryIso };
         startActivityWithTestUrlAndCommandLineArgs(testUrl, cmdlineArgs);
     }
 
     /* @LargeTest */
     @FlakyTest
     @Feature({"ContentDetection", "TabContents"})
     public void testInternationalNumberIntents() throws Throwable {
         startActivityWithTestUrl("content/content_detection/phone_international.html");
         assertWaitForPageScaleFactorMatch(1.0f);
 
@@ skipping 171 matching lines @@
 
         // FR_3: (0) 237 211 992.
         intentUrl = scrollAndTapExpectingIntent("FR_3");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "+33237211992"));
 
         // International numbers should still work.
         intentUrl = scrollAndTapExpectingIntent("International");
         assertTrue(isExpectedTelephoneIntent(intentUrl, "+31205045100"));
     }
 }