Reland "Move //chrome/lib/lifecycle/ to //chrome/browser/android/"

This reverts commit 782b48e7

Patchset 1 of 2 to introduce new target and switch upstream
dependencies, temporarily breaking downstraem.
Patchset 2 will update downstream build targets.

Originally this was a 3-sided patch that attempted to keep downstream
compiling, but it unfortunately broke upstream compilation instead.

BUG=1052382

Change-Id: I5d3a64397e54ec3f6f1e3cac0619ecc796f710bf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095371Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749506}

chrome/android/BUILD.gn

@@ -253,6 +253,7 @@ android_library("chrome_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/lifecycle:java",
     "//chrome/browser/android/thin_webview:factory_java",
     "//chrome/browser/android/thin_webview:java",
     "//chrome/browser/download/android:java",
@@ -276,7 +277,6 @@ android_library("chrome_java") {
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//chrome/browser/xsurface:java",
-    "//chrome/lib/lifecycle/public/android:java",
     "//components/autofill/android:autofill_java",
     "//components/autofill_assistant/browser:proto_java",
     "//components/background_task_scheduler:background_task_scheduler_java",
@@ -794,6 +794,7 @@ android_library("chrome_test_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/lifecycle:java",
     "//chrome/browser/android/metrics:ukm_java_test_support",
     "//chrome/browser/android/metrics:ukm_javatests",
     "//chrome/browser/download/android:java",
@@ -807,7 +808,6 @@ android_library("chrome_test_java") {
     "//chrome/browser/ui/android/appmenu:test_support_java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
-    "//chrome/lib/lifecycle/public/android:java",
     "//chrome/test/android:chrome_java_test_support",
     "//chrome/test/android/test_trusted_web_activity:test_trusted_web_activity_java",
     "//components/autofill/android:autofill_java",

chrome/android/features/autofill_assistant/javatests/DEPS

 include_rules = [
-  "+chrome/lib/image_fetcher",
   "+components/browser_ui/widget/android",
   "+content/public/android/java/src/org/chromium/content_public/browser",
 ]

chrome/android/features/tab_ui/BUILD.gn

@@ -125,11 +125,11 @@ android_library("java") {
     "//chrome/android/features/start_surface/internal:java",
     "//chrome/android/public/profiles:java",
     "//chrome/app:java_strings_grd",
+    "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/flags:java",
     "//chrome/browser/ui/android/strings:ui_strings_grd",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
-    "//chrome/lib/lifecycle/public/android:java",
     "//components/browser_ui/styles/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/embedder_support/android:util_java",

chrome/android/features/tab_ui/java/DEPS

 include_rules = [
- "+chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle",
+ "+chrome/browser/android/lifecycle",
  "+chrome/browser/ui/messages/android/java",
  "+chrome/browser/util",
  "+components/browser_ui/styles/android",

chrome/android/features/tab_ui/junit/DEPS

 include_rules = [
+ "+chrome/browser/android/lifecycle",
  "+chrome/browser/util",
  "+content/public/android/java/src/org/chromium/content_public/browser",
  "+components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement",
  "+components/search_engines/android/java/src/org/chromium/components/search_engines",
- "+chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle"
 ]

chrome/android/feed/DEPS

 include_rules = [
+  "+chrome/browser/android/lifecycle",
   "+chrome/browser/ui/messages/android/java",
-  "+chrome/lib/lifecycle/public",
   "+components/background_task_scheduler",
   "+components/feature_engagement",
   "+components/feed",

chrome/android/feed/dummy/DEPS

 include_rules = [
   "-components/feed",
-  "+chrome/lib/lifecycle/public",
+  "+chrome/browser/android/lifecycle",
   "+components/background_task_scheduler"
 ]

chrome/android/java/DEPS

 include_rules = [
   "-chrome/android/features/keyboard_accessory/internal",
 
+  "+chrome/browser/android/lifecycle",
   "+chrome/browser/android/thin_webview/java",
   "+chrome/browser/flags/android",
   "+chrome/browser/share/android",
@@ -16,7 +17,6 @@ include_rules = [
   "+chrome/browser/preferences/android/java",
   "+chrome/browser/settings/android/java",
   "+chrome/browser/util/android/java",
-  "+chrome/lib/lifecycle/public",
   "+components/autofill/android/java/src/org/chromium/components/autofill",
   "+components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler",
   "+components/bookmarks/common/android/java/src/org/chromium/components/bookmarks",

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

-include_rules = {
-  "+chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle",
-}

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

@@ -12,9 +12,9 @@ include_rules = [
   "+chrome/android/java/src/org/chromium/chrome/browser/ui/TabObscuringHandler.java",
   "+chrome/android/java/src/org/chromium/chrome/browser/webapps/WebDisplayMode.java",
   "+chrome/browser/flags",
+  "+chrome/browser/android/lifecycle",
   "+chrome/browser/preferences",
   "+chrome/browser/ui/android/native_page",
-  "+chrome/lib/lifecycle/public/android",
   "+components/browser_ui/styles/android",
   "+components/browser_ui/widget/android",
   "+content/public/android/java/src/org/chromium/content_public",

chrome/android/javatests/DEPS

 include_rules = [
   "+chrome/app",
+  "+chrome/browser/android/lifecycle",
   "+chrome/browser/preferences/android/java",
   "+chrome/browser/thumbnail/generator/android/java",
   "+chrome/browser/ui/android/appmenu",
   "-chrome/browser/ui/android/appmenu/internal",
   "+chrome/browser/ui/messages/android/java",
   "+chrome/browser/util/android",
-  "+chrome/lib/lifecycle/public",
   "+components/autofill/android/java/src/org/chromium/components/autofill",
   "+components/background_task_scheduler/android/java",
   "+components/bookmarks/common/android/java/src/org/chromium/components/bookmarks",

chrome/android/junit/DEPS

 include_rules = [
   "!clank/java/src/org/chromium/chrome/browser/AppHooksImpl.java",
-  "+chrome/lib/lifecycle/public",
+  "+chrome/browser/android/lifecycle",
   "+chrome/browser/flags/android",
   "+chrome/browser/image_fetcher",
   "+chrome/browser/preferences/android/java",

chrome/browser/android/DEPS

@@ -2,7 +2,6 @@ include_rules = [
   "-components/devtools_bridge",
   "+cc/layers/layer.h",
   "+chrome/android/test_support_jni_headers",
-  "+chrome/lib/image_fetcher/public/android/jni_headers",
   "+chrome_jni_registration/chrome_jni_registration.h",
   "+device/vr/buildflags/buildflags.h",
   "+media/gpu",

chrome/lib/DEPS → chrome/browser/android/lifecycle/DEPS

@@ -6,11 +6,6 @@ include_rules = [
   "-content/public/android",
   "+content/public/android/java/src/org/chromium/content_public",
 
-  # Targets under chrome/lib should generally be independent from browser code.
-  "-chrome/android",
+  # Leaf node, not dependent on other chrome/browser/ code.
   "-chrome/browser",
-
-  # Each directory should only cross-depend on public dirs.
-  # e.g. +chrome/lib/<name>/public for each feature they depend on.
-  "-chrome/lib",
 ]

chrome/lib/lifecycle/OWNERS → chrome/browser/android/lifecycle/OWNERS

-pshmakov@chromium.org
+twellington@chromium.org
+dtrainor@chromium.org
 
 # COMPONENT: UI>Browser>Mobile
 # OS: Android

chrome/browser/ui/android/appmenu/BUILD.gn

@@ -16,7 +16,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/ui/appmenu/CustomViewBinder.java",
     "java/src/org/chromium/chrome/browser/ui/appmenu/MenuButtonDelegate.java",
   ]
-  deps = [ "//chrome/lib/lifecycle/public/android:java" ]
+  deps = [ "//chrome/browser/android/lifecycle:java" ]
 }
 
 android_library_factory("factory_java") {

chrome/browser/ui/android/appmenu/DEPS

@@ -2,7 +2,7 @@ noparent = True
 include_rules = [
   "+base/android",
   "+base/test/android",
-  "+chrome/lib/lifecycle/public",
+  "+chrome/browser/android/lifecycle",
   "+chrome/test/android",
   "+components/browser_ui/styles/android",
   "+components/browser_ui/widget/android",

chrome/browser/ui/android/appmenu/internal/BUILD.gn

@@ -19,9 +19,9 @@ android_library("java") {
   deps = [
     ":java_resources",
     "//base:base_java",
+    "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/browser/ui/android/appmenu:java_resources",
-    "//chrome/lib/lifecycle/public/android:java",
     "//components/browser_ui/widget/android:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
@@ -56,9 +56,9 @@ android_library("javatests") {
     ":test_java_resources",
     "//base:base_java",
     "//base:base_java_test_support",
+    "//chrome/browser/android/lifecycle:java",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/browser/ui/android/appmenu:test_support_java",
-    "//chrome/lib/lifecycle/public/android:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/browser_ui/widget/android:test_support_java",
     "//content/public/test/android:content_java_test_support",

chrome/lib/OWNERS

-dtrainor@chromium.org
-nyquist@chromium.org
-tedchoc@chromium.org
-tiborg@chromium.org
-twellington@chromium.org
-wnwen@chromium.org

tools/android/eclipse/.classpath

@@ -98,6 +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/lifecycle/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"/>
@@ -129,7 +130,6 @@ to the classpath for downstream development. See "additional_entries" below.
     <classpathentry kind="src" path="chrome/browser/ui/messages/android/java/src"/>
     <classpathentry kind="src" path="chrome/browser/util/android/java/src"/>
     <classpathentry kind="src" path="chrome/browser/xsurface/android/java/src"/>
-    <classpathentry kind="src" path="chrome/lib/lifecycle/public/android/java/src"/>
     <classpathentry kind="src" path="chrome/test/android/cast_emulator/src"/>
     <classpathentry kind="src" path="chrome/test/android/javatests/src"/>
     <classpathentry kind="src" path="chrome/test/chromedriver/test/webview_shell/java/src"/>