summaryrefslogtreecommitdiffstats
path: root/net/android/javatests
diff options
context:
space:
mode:
authornyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-24 22:22:27 +0000
committernyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-24 22:22:27 +0000
commita55b0a06a1fd05d566dcb15cfab124b0ac86b857 (patch)
tree55ac2244150ee0788876913506906292511b2b68 /net/android/javatests
parentf5b07a2786db4b74a717f6135933d914ec74bb83 (diff)
downloadchromium_src-a55b0a06a1fd05d566dcb15cfab124b0ac86b857.zip
chromium_src-a55b0a06a1fd05d566dcb15cfab124b0ac86b857.tar.gz
chromium_src-a55b0a06a1fd05d566dcb15cfab124b0ac86b857.tar.bz2
Move base Java utils to base/test/android/javatests.
gyp targets should not depend on tests from other packages, but instead be able to depend on their test utils. The target including the base utilities is called base_java_test_support and contains files from base/test/android/javatests. base_java_test_support was also the name of the wrongly named target for building base/android/javatests, but since only contained util-classes, no new target has been created for tests of base/android/java. BUG=151561,150773 Review URL: https://chromiumcodereview.appspot.com/10974012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158422 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android/javatests')
-rw-r--r--net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java2
-rw-r--r--net/android/javatests/src/org/chromium/net/NetErrorsTest.java4
2 files changed, 2 insertions, 4 deletions
diff --git a/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java b/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
index 83d4d25..c93e9ce 100644
--- a/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
+++ b/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
@@ -24,7 +24,7 @@ import java.net.URISyntaxException;
import java.util.List;
import java.util.Properties;
-import org.chromium.base.test.Feature;
+import org.chromium.base.test.util.Feature;
public class AndroidProxySelectorTest extends InstrumentationTestCase {
Properties mProperties;
diff --git a/net/android/javatests/src/org/chromium/net/NetErrorsTest.java b/net/android/javatests/src/org/chromium/net/NetErrorsTest.java
index 266655c..373e0cb 100644
--- a/net/android/javatests/src/org/chromium/net/NetErrorsTest.java
+++ b/net/android/javatests/src/org/chromium/net/NetErrorsTest.java
@@ -11,9 +11,7 @@ package org.chromium.net;
import android.test.InstrumentationTestCase;
import android.test.suitebuilder.annotation.SmallTest;
-import org.chromium.net.NetError;
-
-import org.chromium.base.test.Feature;
+import org.chromium.base.test.util.Feature;
public class NetErrorsTest extends InstrumentationTestCase {
// These are manually copied and should be kept in sync with net_error_list.h.