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

28 files changed, 37 insertions, 62 deletions

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
index e2594d1..1bb4590 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewLoadUrlTest.java
@@ -4,17 +4,11 @@
 
 package org.chromium.android_webview.test;
 
-import android.content.Context;
 import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.Smoke;
 
-import org.chromium.base.test.Feature;
-import org.chromium.android_webview.AwContents;
-import org.chromium.android_webview.AwWebContentsDelegate;
+import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.ContentViewCore;
 
-import java.util.concurrent.Callable;
-
 /**
  * Test suite for loadUrl().
  */
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java
index b487d7c..05a4074 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java
@@ -9,7 +9,7 @@ import android.webkit.ValueCallback;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.Feature;
+import org.chromium.base.test.util.Feature;
 
 import java.io.File;
 import java.util.concurrent.Semaphore;
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
index 20e1aa6..2c3cbd2 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
@@ -11,7 +11,7 @@ import android.test.UiThreadTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.android_webview.AwContents;
-import org.chromium.base.test.Feature;
+import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.util.CallbackHelper;
 
 import java.util.concurrent.Semaphore;
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
index 666454f..387376d 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -7,20 +7,15 @@ package org.chromium.android_webview.test;
 import android.content.Context;
 import android.os.Build;
 import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.Smoke;
-
-import org.chromium.base.test.Feature;
-import org.chromium.base.test.TestFileUtil;
-import org.chromium.base.test.UrlUtils;
-import org.chromium.android_webview.AwContents;
-import org.chromium.android_webview.AwContentsClient;
-import org.chromium.android_webview.test.TestContentProvider;
+
+import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.TestFileUtil;
+import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content.browser.ContentSettings;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.util.CallbackHelper;
 import org.chromium.content.browser.util.HistoryUtils;
 
-import java.util.concurrent.Callable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
index b1701e51..063c1f3 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/CookieManagerTest.java
@@ -10,7 +10,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Pair;
 
 import org.chromium.android_webview.CookieManager;
-import org.chromium.base.test.Feature;
+import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.util.Criteria;
 import org.chromium.content.browser.util.CriteriaHelper;
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java
index ebfcfe6..57f269a 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/HttpAuthDatabaseTest.java
@@ -5,11 +5,10 @@
 package org.chromium.android_webview.test;
 
 import android.test.AndroidTestCase;
-import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.android_webview.HttpAuthDatabase;
-import org.chromium.base.test.Feature;
+import org.chromium.base.test.util.Feature;
 
 /**
  * Test suite for HttpAuthDatabase.
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java
index 218c0a7..182ed81 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewAsynchronousFindApisTest.java
@@ -6,7 +6,7 @@ package org.chromium.android_webview.test;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import org.chromium.base.test.Feature;
+import org.chromium.base.test.util.Feature;
 
 /**
  * Tests the asynchronous find-in-page APIs in WebView.
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java
index b91523f..b4e0854 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewMixedFindApisTest.java
@@ -6,7 +6,7 @@ package org.chromium.android_webview.test;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import org.chromium.base.test.Feature;
+import org.chromium.base.test.util.Feature;
 
 /**
  * Tests the mixed use of synchronous and asynchronous find-in-page APIs in WebView.
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
index 473f8f1..eae934a 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
@@ -11,16 +11,13 @@ package org.chromium.android_webview.test;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import junit.framework.Assert;
-
 import org.chromium.android_webview.JsPromptResultReceiver;
 import org.chromium.android_webview.JsResultReceiver;
-import org.chromium.base.test.Feature;
+import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.util.CallbackHelper;
 
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 
 public class WebViewModalDialogOverrideTest extends AndroidWebViewTestBase {
     private final static String EMPTY_PAGE =
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java
index 272e330..4571872 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewSynchronousFindApisTest.java
@@ -6,7 +6,7 @@ package org.chromium.android_webview.test;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import org.chromium.base.test.Feature;
+import org.chromium.base.test.util.Feature;
 
 /**
  * Tests the synchronous find-in-page APIs in WebView.
diff --git a/base/base.gyp b/base/base.gyp
index 17fde6b..c33eff1 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -976,7 +976,7 @@
           ],
           'variables': {
             'package_name': 'base_javatests',
-            'java_in_dir': '../base/android/javatests',
+            'java_in_dir': '../base/test/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
         },
diff --git a/base/test/android/OWNERS b/base/test/android/OWNERS
new file mode 100644
index 0000000..5112eae
--- /dev/null
+++ b/base/test/android/OWNERS
@@ -0,0 +1,6 @@
+jrg@chromium.org
+bulach@chromium.org
+satish@chromium.org
+joth@chromium.org
+jcivelli@chromium.org
+yfriedman@chromium.org
diff --git a/base/android/javatests/src/org/chromium/base/test/DisabledTest.java b/base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java
index 2c8ad9a..c2b2ecd 100644
--- a/base/android/javatests/src/org/chromium/base/test/DisabledTest.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.base.test;
+package org.chromium.base.test.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/base/android/javatests/src/org/chromium/base/test/Feature.java b/base/test/android/javatests/src/org/chromium/base/test/util/Feature.java
index 76fba41..aa120ea 100644
--- a/base/android/javatests/src/org/chromium/base/test/Feature.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/Feature.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.base.test;
+package org.chromium.base.test.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/base/android/javatests/src/org/chromium/base/test/InstrumentationUtils.java b/base/test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.java
index f8ae158..0dc730a 100644
--- a/base/android/javatests/src/org/chromium/base/test/InstrumentationUtils.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/InstrumentationUtils.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.base.test;
+package org.chromium.base.test.util;
 
 import android.app.Instrumentation;
 
diff --git a/base/android/javatests/src/org/chromium/base/test/ScalableTimeout.java b/base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java
index d502aaa..a107b32 100644
--- a/base/android/javatests/src/org/chromium/base/test/ScalableTimeout.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/ScalableTimeout.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.base.test;
+package org.chromium.base.test.util;
 
 /**
  * Utility class for scaling various timeouts by a common factor.
diff --git a/base/android/javatests/src/org/chromium/base/test/TestFileUtil.java b/base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java
index 36b2436..1afbc11 100644
--- a/base/android/javatests/src/org/chromium/base/test/TestFileUtil.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/TestFileUtil.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.base.test;
+package org.chromium.base.test.util;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/base/android/javatests/src/org/chromium/base/test/UrlUtils.java b/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java
index 924cbbc..7c13a32 100644
--- a/base/android/javatests/src/org/chromium/base/test/UrlUtils.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.base.test;
+package org.chromium.base.test.util;
 
 import org.chromium.base.PathUtils;
 
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/test/DummyIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/test/DummyIntegrationTest.java
index 00a403f..fba3b5a 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/test/DummyIntegrationTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/test/DummyIntegrationTest.java
@@ -4,10 +4,7 @@
 
 package org.chromium.chrome.testshell;
 
-import org.chromium.base.test.DisabledTest;
-
-import org.chromium.chrome.testshell.ChromiumTestShellActivity;
-import org.chromium.chrome.testshell.ChromiumTestShellTestBase;
+import org.chromium.base.test.util.DisabledTest;
 
 // TODO(dtrainor): Once some other tests are integrated to this directory remove this.
 public class DummyIntegrationTest extends ChromiumTestShellTestBase {
diff --git a/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellUrlTest.java b/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellUrlTest.java
index c0821ac..cd81abb 100644
--- a/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellUrlTest.java
+++ b/chrome/android/testshell/javatests/src/org/chromium/chrome/testshell/ChromiumTestShellUrlTest.java
@@ -4,7 +4,7 @@
 
 package org.chromium.chrome.testshell;
 
-import org.chromium.base.test.DisabledTest;
+import org.chromium.base.test.util.DisabledTest;
 
 public class ChromiumTestShellUrlTest extends ChromiumTestShellTestBase {
     // URL used for base tests.
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.
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.