summaryrefslogtreecommitdiffstats
path: root/chrome/test/android/javatests
diff options
context:
space:
mode:
authorjdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-20 03:01:07 +0000
committerjdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-20 03:01:07 +0000
commitb873bc8b51dbee1193f3e6b48db0d08a86e3badc (patch)
tree4e5ef2799807c547deb9af271b3af6b5a77fb635 /chrome/test/android/javatests
parentccb962dfd9abe9fe9c990372a56e04cc9aa8ddb8 (diff)
downloadchromium_src-b873bc8b51dbee1193f3e6b48db0d08a86e3badc.zip
chromium_src-b873bc8b51dbee1193f3e6b48db0d08a86e3badc.tar.gz
chromium_src-b873bc8b51dbee1193f3e6b48db0d08a86e3badc.tar.bz2
[Android] Move CommandLine.java to base
The native CommandLine lives in base, and so too should the Java wrapper. Move CommandLine.java to base, updating all references and factoring out previously contained switches to BaseSwitches and ContentSwitches. BUG=320747 TBR=ajwong@chromium.org Review URL: https://codereview.chromium.org/62333025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/android/javatests')
-rw-r--r--chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java
index a97512b..98f79e3 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/sync/SyncTestUtil.java
@@ -11,13 +11,13 @@ import android.util.Pair;
import junit.framework.Assert;
+import org.chromium.base.CommandLine;
import org.chromium.base.ThreadUtils;
import org.chromium.base.test.util.AdvancedMockContext;
import org.chromium.chrome.browser.sync.ProfileSyncService;
import org.chromium.chrome.test.util.TestHttpServerClient;
import org.chromium.content.browser.test.util.Criteria;
import org.chromium.content.browser.test.util.CriteriaHelper;
-import org.chromium.content.common.CommandLine;
import org.chromium.sync.signin.AccountManagerHelper;
import org.chromium.sync.signin.ChromeSigninController;
import org.chromium.sync.test.util.AccountHolder;