Revert "Move //chrome/android/public/ to //chrome/browser/android/"

This reverts commit a8ed939a.

Reason for revert: Moving to different directory

Original change's description:
> Move //chrome/android/public/ to //chrome/browser/android/
> 
> Change 1 of 2. The next CL will update downstream dependencies.
> 
> Note that this will break the downstream build temporarily. Since there
> are JNI files generated, unless the package is updated we cannot keep
> a temporary mirrored build target as was done in
> https://chromium-review.googlesource.com/c/chromium/src/+/2095444
> 
> BUG=1052382
> 
> Change-Id: Ib4d2e6f8143a7c0c6ead75d7701fea69a21db3a3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095760
> Commit-Queue: Theresa  <twellington@chromium.org>
> Reviewed-by: David Trainor <dtrainor@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#749666}

TBR=dtrainor@chromium.org,twellington@chromium.org

Change-Id: Ieb5026e18ccbc629be00c6a10762253908a98ae2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1052382
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2100709Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749672}

chrome/android/BUILD.gn

@@ -246,14 +246,14 @@ android_library("chrome_java") {
     "//chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library:piet_resources",
     "//chrome/android/modules/image_editor/provider:java",
     "//chrome/android/modules/image_editor/public:java",
+    "//chrome/android/public/crypto:java",
+    "//chrome/android/public/profiles:java",
     "//chrome/android/third_party/compositor_animator:compositor_animator_java",
     "//chrome/android/webapk/libs/client:client_java",
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/android/webapk/libs/common:splash_java",
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
-    "//chrome/browser/android/crypto:java",
     "//chrome/browser/android/lifecycle:java",
-    "//chrome/browser/android/profiles:java",
     "//chrome/browser/android/thin_webview:factory_java",
     "//chrome/browser/android/thin_webview:java",
     "//chrome/browser/download/android:java",
@@ -552,7 +552,7 @@ group("jni_headers") {
     "//chrome/android/features/cablev2_authenticator/internal:jni_headers",
     "//chrome/android/features/keyboard_accessory:jni_headers",
     "//chrome/android/features/media_router:jni_headers",
-    "//chrome/browser/android/profiles:jni_headers",
+    "//chrome/android/public/profiles:jni_headers",
     "//chrome/browser/download/android:jni_headers",
     "//chrome/browser/flags:jni_headers",
     "//chrome/browser/geolocation/android:jni_headers",
@@ -790,14 +790,14 @@ android_library("chrome_test_java") {
     "//chrome/android:chrome_java",
     "//chrome/android/features/start_surface/internal:java",
     "//chrome/android/features/tab_ui:java",
+    "//chrome/android/public/crypto:java",
+    "//chrome/android/public/profiles:java",
     "//chrome/android/third_party/compositor_animator:compositor_animator_java",
     "//chrome/android/webapk/libs/client:client_java",
     "//chrome/android/webapk/libs/common:common_java",
-    "//chrome/browser/android/crypto:java",
     "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/android/metrics:ukm_java_test_support",
     "//chrome/browser/android/metrics:ukm_javatests",
-    "//chrome/browser/android/profiles:java",
     "//chrome/browser/download/android:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/performance_hints/android:java",
@@ -1577,7 +1577,7 @@ android_library("browser_java_test_support") {
     "$google_play_services_package:google_play_services_gcm_java",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//chrome/browser/android/profiles:java",
+    "//chrome/android/public/profiles:java",
     "//components/offline_items_collection/core:core_java",
     "//components/sync/protocol:protocol_java",
     "//content/public/android:content_java",
@@ -2912,7 +2912,7 @@ android_library("native_java_unittests_java") {
     "//base:jni_java",
     "//base/test:test_support_java",
     "//chrome/android:chrome_java",
-    "//chrome/browser/android/profiles:java",
+    "//chrome/android/public/profiles:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/util:java",
     "//chrome/test/android:chrome_java_test_support",

chrome/android/features/autofill_assistant/BUILD.gn

@@ -33,7 +33,7 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//chrome/android:chrome_java",
-    "//chrome/browser/android/profiles:java",
+    "//chrome/android/public/profiles:java",
     "//chrome/browser/image_fetcher:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",

chrome/android/features/keyboard_accessory/BUILD.gn

@@ -60,7 +60,7 @@ android_library("test_java") {
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_java",
     "//chrome/android:chrome_test_util_java",
-    "//chrome/browser/android/profiles:java",
+    "//chrome/android/public/profiles:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill/android:autofill_java",

chrome/android/features/keyboard_accessory/internal/BUILD.gn

@@ -15,7 +15,7 @@ android_library("internal_java") {
     # TODO(crbug/951695): Cyclic dependency. Depend on public only when ready.
     "//chrome/android:chrome_java",
     "//chrome/android/features/keyboard_accessory/public:public_java",
-    "//chrome/browser/android/profiles:java",
+    "//chrome/android/public/profiles:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/util:java",
     "//components/autofill/android:autofill_java",

chrome/android/features/start_surface/internal/BUILD.gn

@@ -65,7 +65,7 @@ android_library("java") {
     ]
 
     deps += [
-      "//chrome/browser/android/profiles:java",
+      "//chrome/android/public/profiles:java",
       "//content/public/android:content_java",
       "//third_party/android_sdk/androidx_browser:androidx_browser_java",
       "//ui/android:ui_utils_java",

chrome/android/features/tab_ui/BUILD.gn

@@ -123,9 +123,9 @@ android_library("java") {
     "//chrome/android:chrome_java",
     "//chrome/android:ui_locale_string_resources",
     "//chrome/android/features/start_surface/internal:java",
+    "//chrome/android/public/profiles:java",
     "//chrome/app:java_strings_grd",
     "//chrome/browser/android/lifecycle:java",
-    "//chrome/browser/android/profiles:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/ui/android/strings:ui_strings_grd",
     "//chrome/browser/ui/messages/android:java",

chrome/android/java/src/org/chromium/chrome/browser/tab/DEPS

@@ -38,7 +38,7 @@ specific_include_rules = {
     "+chrome/android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java",
     "+chrome/android/java/src/org/chromium/chrome/browser/rlz/RevenueStats.java",
     "+chrome/android/java/src/org/chromium/chrome/browser/night_mode",
-    "+chrome/browser/android/profiles/java/src/org/chromium/chrome/browser/profiles/Profile.java",
+    "+chrome/android/public/profiles/java/src/org/chromium/chrome/browser/profiles/Profile.java",
     "+chrome/browser/util/android/java/src/org/chromium/chrome/browser/util/UrlConstants.java",
 
     "-components",

chrome/browser/android/crypto/DEPS → chrome/android/public/DEPS

 include_rules = [
-  "-chrome/browser/",
+  "-chrome/android/java",
+  "-chrome/android/features",
+
   "-content/public/android",
   "+content/public/android/java/src/org/chromium/content_public",
 ]

chrome/android/public/README.md

+# Public Chrome on Android Targets
+
+This is the top-level directory for all chrome on android targets that do not
+depend on files under `//chrome/android/java` or `//chrome/android/features`.
+Each subdirectory should specify its own java target and contain all the
+source code that target defines. e.g. [lifecycle/BUILD.gn](lifecycle/BUILD.gn).
+
+This layer can be considered as the base layer within the android-specific
+chrome layer. This directory serves a similar purpose as the `public/`
+subdirectories within individual features under `//chrome/android/features`.
+Those features can then safely depend on targets in `//chrome/android/public`
+without needing to transitively depending on all of the code in
+`//chrome/android/java`.

chrome/browser/android/profiles/BUILD.gn → chrome/android/public/profiles/BUILD.gn

@@ -10,7 +10,7 @@ android_library("java") {
   deps = [
     "//base:base_java",
     "//base:jni_java",
-    "//chrome/browser/android/crypto:java",
+    "//chrome/android/public/crypto:java",
     "//chrome/browser/preferences:java",
     "//content/public/android:content_java",
   ]

chrome/browser/DEPS

@@ -6,7 +6,7 @@ include_rules = [
   "+chrome/android/features/autofill_assistant/jni_headers",
   "+chrome/android/features/dev_ui",
   "+chrome/android/modules",
-  "+chrome/browser/android/profiles/jni_headers",
+  "+chrome/android/public/profiles/jni_headers",
   "+chrome/android/test_support_jni_headers",
   "+chrome/app",
   "+chrome/credential_provider/common",

chrome/browser/android/cookies/cookies_fetcher_util.cc

@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/time/time.h"
-#include "chrome/browser/android/profiles/jni_headers/CookiesFetcher_jni.h"
+#include "chrome/android/public/profiles/jni_headers/CookiesFetcher_jni.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/android/profiles/DEPS

-include_rules = [
-  "-chrome/browser/",
-  "+chrome/browser/android/crypto/",
-  "-content/public/android",
-  "+content/public/android/java/src/org/chromium/content_public",
-]

chrome/browser/android/profiles/profile_manager_utils.cc

@@ -6,7 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/bind.h"
-#include "chrome/browser/android/profiles/jni_headers/ProfileManagerUtils_jni.h"
+#include "chrome/android/public/profiles/jni_headers/ProfileManagerUtils_jni.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"

chrome/browser/image_fetcher/BUILD.gn

@@ -8,7 +8,7 @@ android_library("java") {
   deps = [
     "//base:base_java",
     "//base:jni_java",
-    "//chrome/browser/android/profiles:java",
+    "//chrome/android/public/profiles:java",
     "//chrome/browser/util:java",
     "//content/public/android:content_java",
     "//third_party/gif_player:gif_player_java",

chrome/browser/image_fetcher/DEPS

 include_rules = [
-  "+chrome/browser/android/profiles",
+  # TODO(crbug/973821): Temporary until profiles is moved to chrome/lib.
+  "+chrome/android/public/profiles",
 
   "+chrome/browser/util",
   "+content/public/android/java/src/org/chromium/content_public",

chrome/browser/profiles/profile_android.cc

@@ -6,7 +6,7 @@
 
 #include "base/android/jni_android.h"
 #include "base/memory/ptr_util.h"
-#include "chrome/browser/android/profiles/jni_headers/Profile_jni.h"
+#include "chrome/android/public/profiles/jni_headers/Profile_jni.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/profiles/profile_key.h"

chrome/browser/profiles/profile_key_android.cc

@@ -6,8 +6,8 @@
 
 #include "base/android/jni_android.h"
 #include "base/memory/ptr_util.h"
+#include "chrome/android/public/profiles/jni_headers/ProfileKey_jni.h"
 #include "chrome/browser/android/profile_key_util.h"
-#include "chrome/browser/android/profiles/jni_headers/ProfileKey_jni.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_key.h"
 #include "chrome/browser/profiles/profile_manager.h"

chrome/browser/profiles/profile_manager_android.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/profiles/profile_manager_android.h"
 
-#include "chrome/browser/android/profiles/jni_headers/ProfileManager_jni.h"
+#include "chrome/android/public/profiles/jni_headers/ProfileManager_jni.h"
 #include "chrome/browser/profiles/profile_android.h"
 
 ProfileManagerAndroid::ProfileManagerAndroid() = default;

chrome/browser/touch_to_fill/android/internal/BUILD.gn

@@ -12,7 +12,7 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//chrome/android:chrome_java",
-    "//chrome/browser/android/profiles:java",
+    "//chrome/android/public/profiles:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/touch_to_fill/android:public_java",
     "//chrome/browser/util:java",

tools/android/eclipse/.classpath

@@ -86,6 +86,8 @@ to the classpath for downstream development. See "additional_entries" below.
     <classpathentry kind="src" path="chrome/android/modules/test_dummy/provider/java/src"/>
     <classpathentry kind="src" path="chrome/android/modules/test_dummy/public/java/src"/>
     <classpathentry kind="src" path="chrome/android/native_java_unittests/src"/>
+    <classpathentry kind="src" path="chrome/android/public/crypto/java/src"/>
+    <classpathentry kind="src" path="chrome/android/public/profiles/java/src"/>
     <classpathentry kind="src" path="chrome/android/third_party/compositor_animator/java/src"/>
     <classpathentry kind="src" path="chrome/android/webapk/libs/client/junit/src"/>
     <classpathentry kind="src" path="chrome/android/webapk/libs/client/src"/>
@@ -96,9 +98,7 @@ to the classpath for downstream development. See "additional_entries" below.
     <classpathentry kind="src" path="chrome/android/webapk/shell_apk/javatests/src"/>
     <classpathentry kind="src" path="chrome/android/webapk/shell_apk/junit/src"/>
     <classpathentry kind="src" path="chrome/android/webapk/shell_apk/src"/>
-    <classpathentry kind="src" path="chrome/browser/android/crypto/java/src"/>
     <classpathentry kind="src" path="chrome/browser/android/lifecycle/java/src"/>
-    <classpathentry kind="src" path="chrome/browser/android/profiles/java/src"/>
     <classpathentry kind="src" path="chrome/browser/android/metrics/javatests/src"/>
     <classpathentry kind="src" path="chrome/browser/android/thin_webview/internal/java/src"/>
     <classpathentry kind="src" path="chrome/browser/android/thin_webview/java/src"/>