weblayer: directory cleanup

moves weblayer/shell/android/javatests to
weblayer/browser/android/javatests

My plan is to move weblayer/browser/java
into this directory next.

BUG=none
TEST=none

Change-Id: If442c9ebe6204a26038585e4fa53875c866a1fc8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1910814
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714624}

diff --git a/BUILD.gn b/BUILD.gn
index 90c41d93..de1251f 100644
--- a/BUILD.gn
+++ b/BUILD.gn

@@ -200,6 +200,9 @@
       "//weblayer/shell:weblayer_shell",
       "//weblayer/test:weblayer_browsertests",
     ]
+    if (is_android) {
+      deps += [ "//weblayer/browser/android/javatests:weblayer_instrumentation_test_apk" ]
+    }
   }
 
   if (!is_ios && !is_android) {

diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index aca4359..bf5316a 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl

@@ -3081,7 +3081,7 @@
     "type": "console_test_launcher",
   },
   "weblayer_instrumentation_test_apk": {
-    "label": "//weblayer/shell/android:weblayer_instrumentation_test_apk",
+    "label": "//weblayer/browser/android/javatests:weblayer_instrumentation_test_apk",
     "type": "console_test_launcher",
   },
   "weblayer_shell": {

diff --git a/weblayer/shell/android/javatests/AndroidManifest.xml b/weblayer/browser/android/javatests/AndroidManifest.xml
similarity index 100%
rename from weblayer/shell/android/javatests/AndroidManifest.xml
rename to weblayer/browser/android/javatests/AndroidManifest.xml

diff --git a/weblayer/browser/android/javatests/BUILD.gn b/weblayer/browser/android/javatests/BUILD.gn
new file mode 100644
index 0000000..c267418
--- /dev/null
+++ b/weblayer/browser/android/javatests/BUILD.gn

@@ -0,0 +1,47 @@
+# Copyright 2019 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.
+
+import("//build/config/android/config.gni")
+import("//build/config/android/rules.gni")
+
+instrumentation_test_apk("weblayer_instrumentation_test_apk") {
+  apk_name = "WebLayerInstrumentationTest"
+  apk_under_test = "//weblayer/shell/android:weblayer_shell_apk"
+  android_manifest = "AndroidManifest.xml"
+  min_sdk_version = 21
+  deps = [
+    "//base:base_java_test_support",
+    "//content/public/test/android:content_java_test_support",
+    "//net/android:net_java_test_support",
+    "//third_party/android_support_test_runner:runner_java",
+    "//weblayer/public/javatests:weblayer_public_javatests",
+  ]
+  java_files = [
+    "src/org/chromium/weblayer/test/DataClearingTest.java",
+    "src/org/chromium/weblayer/test/DownloadCallbackTest.java",
+    "src/org/chromium/weblayer/test/EventUtils.java",
+    "src/org/chromium/weblayer/test/EventUtils.java",
+    "src/org/chromium/weblayer/test/ExecuteScriptTest.java",
+    "src/org/chromium/weblayer/test/BrowserFragmentLifecycleTest.java",
+    "src/org/chromium/weblayer/test/FullscreenCallbackTest.java",
+    "src/org/chromium/weblayer/test/InputTypesTest.java",
+    "src/org/chromium/weblayer/test/InstrumentationActivityTestRule.java",
+    "src/org/chromium/weblayer/test/NavigationTest.java",
+    "src/org/chromium/weblayer/test/NewTabCallbackImpl.java",
+    "src/org/chromium/weblayer/test/NewTabCallbackTest.java",
+    "src/org/chromium/weblayer/test/RenderingTest.java",
+    "src/org/chromium/weblayer/test/ProfileTest.java",
+    "src/org/chromium/weblayer/test/SmokeTest.java",
+    "src/org/chromium/weblayer/test/TabCallbackTest.java",
+    "src/org/chromium/weblayer/test/TopControlsTest.java",
+    "src/org/chromium/weblayer/test/TabListCallbackTest.java",
+  ]
+  additional_apks = [
+    "//weblayer/shell/android:weblayer_support_apk",
+    "//net/android:net_test_support_apk",
+  ]
+  data = [
+    "//weblayer/test/data/",
+  ]
+}

diff --git a/weblayer/shell/android/javatests/DEPS b/weblayer/browser/android/javatests/DEPS
similarity index 100%
rename from weblayer/shell/android/javatests/DEPS
rename to weblayer/browser/android/javatests/DEPS

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/BrowserFragmentLifecycleTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/BrowserFragmentLifecycleTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/BrowserFragmentLifecycleTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/BrowserFragmentLifecycleTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/DataClearingTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/DataClearingTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/DataClearingTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/DataClearingTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/DownloadCallbackTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/DownloadCallbackTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/DownloadCallbackTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/DownloadCallbackTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/EventUtils.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/EventUtils.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/EventUtils.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/EventUtils.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/ExecuteScriptTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/ExecuteScriptTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/ExecuteScriptTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/ExecuteScriptTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/FragmentRestoreTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FragmentRestoreTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/FragmentRestoreTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FragmentRestoreTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/FullscreenCallbackTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/InputTypesTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/InputTypesTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/InputTypesTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/InputTypesTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/InstrumentationActivityTestRule.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/InstrumentationActivityTestRule.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/InstrumentationActivityTestRule.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/InstrumentationActivityTestRule.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/NavigationTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/NavigationTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/NavigationTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/NavigationTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/NewTabCallbackImpl.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/NewTabCallbackImpl.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/NewTabCallbackImpl.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/NewTabCallbackImpl.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/NewTabCallbackTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/NewTabCallbackTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/NewTabCallbackTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/NewTabCallbackTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/ProfileTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/ProfileTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/ProfileTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/ProfileTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/RenderingTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/RenderingTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/RenderingTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/RenderingTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/SmokeTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/SmokeTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/SmokeTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/SmokeTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/TabCallbackTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TabCallbackTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/TabCallbackTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TabCallbackTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/TabListCallbackTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TabListCallbackTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/TabListCallbackTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TabListCallbackTest.java

diff --git a/weblayer/shell/android/javatests/src/org/chromium/weblayer/test/TopControlsTest.java b/weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TopControlsTest.java
similarity index 100%
rename from weblayer/shell/android/javatests/src/org/chromium/weblayer/test/TopControlsTest.java
rename to weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TopControlsTest.java

diff --git a/weblayer/shell/android/BUILD.gn b/weblayer/shell/android/BUILD.gn
index fc311d2..d09c26a 100644
--- a/weblayer/shell/android/BUILD.gn
+++ b/weblayer/shell/android/BUILD.gn

@@ -185,44 +185,3 @@
 
   shared_libraries = [ "//weblayer:libweblayer" ]
 }
-
-instrumentation_test_apk("weblayer_instrumentation_test_apk") {
-  apk_name = "WebLayerInstrumentationTest"
-  apk_under_test = "//weblayer/shell/android:weblayer_shell_apk"
-  android_manifest = "javatests/AndroidManifest.xml"
-  min_sdk_version = 21
-  deps = [
-    "//base:base_java_test_support",
-    "//content/public/test/android:content_java_test_support",
-    "//net/android:net_java_test_support",
-    "//third_party/android_support_test_runner:runner_java",
-    "//weblayer/public/javatests:weblayer_public_javatests",
-  ]
-  java_files = [
-    "javatests/src/org/chromium/weblayer/test/DataClearingTest.java",
-    "javatests/src/org/chromium/weblayer/test/DownloadCallbackTest.java",
-    "javatests/src/org/chromium/weblayer/test/EventUtils.java",
-    "javatests/src/org/chromium/weblayer/test/EventUtils.java",
-    "javatests/src/org/chromium/weblayer/test/ExecuteScriptTest.java",
-    "javatests/src/org/chromium/weblayer/test/BrowserFragmentLifecycleTest.java",
-    "javatests/src/org/chromium/weblayer/test/FullscreenCallbackTest.java",
-    "javatests/src/org/chromium/weblayer/test/InputTypesTest.java",
-    "javatests/src/org/chromium/weblayer/test/InstrumentationActivityTestRule.java",
-    "javatests/src/org/chromium/weblayer/test/NavigationTest.java",
-    "javatests/src/org/chromium/weblayer/test/NewTabCallbackImpl.java",
-    "javatests/src/org/chromium/weblayer/test/NewTabCallbackTest.java",
-    "javatests/src/org/chromium/weblayer/test/RenderingTest.java",
-    "javatests/src/org/chromium/weblayer/test/ProfileTest.java",
-    "javatests/src/org/chromium/weblayer/test/SmokeTest.java",
-    "javatests/src/org/chromium/weblayer/test/TabCallbackTest.java",
-    "javatests/src/org/chromium/weblayer/test/TopControlsTest.java",
-    "javatests/src/org/chromium/weblayer/test/TabListCallbackTest.java",
-  ]
-  additional_apks = [
-    "//weblayer/shell/android:weblayer_support_apk",
-    "//net/android:net_test_support_apk",
-  ]
-  data = [
-    "//weblayer/test/data/",
-  ]
-}