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

6 files changed, 7 insertions, 18 deletions

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
index 645b48c..2b3b1cf 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
@@ -8,19 +8,14 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.test.InstrumentationTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
-import android.view.ViewConfiguration;
-import android.view.GestureDetector.OnGestureListener;
 
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
 
-import org.chromium.base.test.Feature;
-import org.chromium.base.test.ScalableTimeout;
+import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.ContentViewGestureHandler.MotionEventDelegate;
 
 /**
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java b/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java
index c8a55e8..0fa6c06 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/LocationProviderTest.java
@@ -4,13 +4,12 @@
 
 package org.chromium.content.browser;
 
-import android.os.Looper;
 import android.test.UiThreadTest;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ActivityStatus;
-import org.chromium.base.test.Feature;
+import org.chromium.base.test.util.Feature;
 
 /**
  * Test suite for LocationProvider.
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java b/content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java
index 71718a6..06ddae3 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/LongPressDetectorTest.java
@@ -4,20 +4,18 @@
 
 package org.chromium.content.browser;
 
-import android.content.Context;
 import android.os.SystemClock;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.SmallTest;
-import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.chromium.base.test.Feature;
-import org.chromium.base.test.ScalableTimeout;
+import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.ScalableTimeout;
 
 /**
  * Test suite for LongPressDetector.
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
index 233ef5c..12d93bb 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
@@ -9,14 +9,13 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.MotionEvent;
 import android.view.View;
 
-import org.chromium.base.test.Feature;
+import org.chromium.base.test.util.Feature;
 
 /**
  * Tests for PopupZoomer.
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/util/HistoryUtils.java b/content/public/android/javatests/src/org/chromium/content/browser/util/HistoryUtils.java
index c5f3b43..e7c67fb 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/util/HistoryUtils.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/util/HistoryUtils.java
@@ -6,7 +6,7 @@ package org.chromium.content.browser.util;
 
 import android.app.Instrumentation;
 
-import org.chromium.base.test.InstrumentationUtils;
+import org.chromium.base.test.util.InstrumentationUtils;
 import org.chromium.content.browser.ContentViewCore;
 
 import java.util.concurrent.Callable;
diff --git a/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java b/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java
index 9b50167..05eba42 100644
--- a/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java
+++ b/content/shell/android/javatests/src/org/chromium/content_shell/ContentShellUrlTest.java
@@ -4,11 +4,9 @@
 
 package org.chromium.content_shell;
 
-import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import org.chromium.base.test.Feature;
+import org.chromium.base.test.util.Feature;
 
 /**
  * Example test that just starts the content shell.