Move contents of chrome/lib/util to chrome/browser/util.

Leaving a dummy build target back so that clank dependencies on
chrome/lib/util don't break. Will remove them and then delete the
dummy target.

Bug: 995916
Change-Id: I9842f4f74f7035718d16d79d0469c52b09cc37f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1804036
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Brandon Wylie <wylieb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699816}

chrome/android/BUILD.gn

@@ -282,7 +282,6 @@ android_library("chrome_java") {
     "//chrome/browser/ui/android/widget:java",
     "//chrome/browser/util/android:java",
     "//chrome/lib/lifecycle/public/android:java",
-    "//chrome/lib/util/public/android:java",
     "//components/autofill/android:autofill_java",
     "//components/autofill_assistant/browser:proto_java",
     "//components/background_task_scheduler:background_task_scheduler_java",
@@ -537,7 +536,7 @@ group("jni_headers") {
     "//chrome/android/public/profiles:jni_headers",
     "//chrome/browser/image_fetcher:jni_headers",
     "//chrome/browser/touch_to_fill/android:jni_headers",
-    "//chrome/lib/util/public/android:jni_headers",
+    "//chrome/browser/util/android:jni_headers",
   ]
 }
 
@@ -817,7 +816,6 @@ android_library("chrome_test_java") {
     "//chrome/browser/android/metrics:ukm_utils_java",
     "//chrome/browser/ui/android/widget:java",
     "//chrome/browser/util/android:java",
-    "//chrome/lib/util/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",
@@ -973,7 +971,6 @@ if (enable_vr || enable_arcore) {
     "//chrome/android:chrome_java",
     "//chrome/android/features/vr:java",
     "//chrome/browser/util/android:java",
-    "//chrome/lib/util/public/android:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/policy/android:policy_java",
     "//content/public/android:content_java",

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

@@ -16,7 +16,7 @@ android_library("internal_java") {
     "//chrome/android:chrome_public_java",
     "//chrome/android/features/keyboard_accessory/public:public_java",
     "//chrome/android/public/profiles:java",
-    "//chrome/lib/util/public/android:java",
+    "//chrome/browser/util/android:java",
     "//components/autofill/android:autofill_java",
     "//components/feature_engagement/public:public_java",
     "//content/public/android:content_java",

chrome/android/features/tab_ui/BUILD.gn

@@ -150,8 +150,8 @@ android_library("java") {
     "//chrome/android/public/profiles:java",
     "//chrome/app:java_strings_grd",
     "//chrome/browser/ui/android/widget:java",
+    "//chrome/browser/util/android:java",
     "//chrome/lib/lifecycle/public/android:java",
-    "//chrome/lib/util/public/android:java",
     "//components/embedder_support/android:web_contents_delegate_java",
     "//components/feature_engagement:feature_engagement_java",
     "//components/policy/android:policy_java",

chrome/browser/android/util/url_utilities.cc

@@ -7,7 +7,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/strings/string_util.h"
-#include "chrome/lib/util/public/android/jni_headers/UrlUtilities_jni.h"
+#include "chrome/browser/util/android/jni_headers/UrlUtilities_jni.h"
 #include "components/google/core/common/google_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/gurl.h"

chrome/browser/image_fetcher/BUILD.gn

@@ -9,7 +9,7 @@ android_library("java") {
     "//base:base_java",
     "//base:jni_java",
     "//chrome/android/public/profiles:java",
-    "//chrome/lib/util/public/android:java",
+    "//chrome/browser/util/android:java",
     "//content/public/android:content_java",
     "//third_party/gif_player:gif_player_java",
   ]

chrome/browser/image_fetcher/DEPS

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

chrome/browser/util/DEPS

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

chrome/browser/util/android/BUILD.gn

@@ -6,14 +6,30 @@ import("//build/config/android/rules.gni")
 
 android_library("java") {
   java_files = [
+    "java/src/org/chromium/chrome/browser/util/BitmapCache.java",
+    "java/src/org/chromium/chrome/browser/util/ConversionUtils.java",
+    "java/src/org/chromium/chrome/browser/util/FileSizeUtil.java",
     "java/src/org/chromium/chrome/browser/util/HashUtil.java",
     "java/src/org/chromium/chrome/browser/util/IntentUtils.java",
+    "java/src/org/chromium/chrome/browser/util/KeyNavigationUtil.java",
+    "java/src/org/chromium/chrome/browser/util/MathUtils.java",
+    "java/src/org/chromium/chrome/browser/util/ChromeFileProvider.java",
+    "java/src/org/chromium/chrome/browser/util/UrlConstants.java",
+    "java/src/org/chromium/chrome/browser/util/UrlUtilities.java",
   ]
   deps = [
     "//base:base_java",
+    "//base:jni_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:com_android_support_collections_java",
     "//third_party/android_deps:com_android_support_support_compat_java",
     "//third_party/android_deps:com_android_support_support_core_utils_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+}
+
+generate_jni("jni_headers") {
+  sources = [
+    "java/src/org/chromium/chrome/browser/util/UrlUtilities.java",
+  ]
 }

chrome/lib/util/public/android/BUILD.gn

@@ -4,30 +4,9 @@
 
 import("//build/config/android/rules.gni")
 
-android_library("java") {
+# Temporary target until clank removes this as a dependency.
+java_group("java") {
   deps = [
-    "//base:base_java",
-    "//base:jni_java",
-    "//content/public/android:content_java",
-    "//third_party/android_deps:com_android_support_collections_java",
-    "//third_party/android_deps:com_android_support_support_compat_java",
-    "//third_party/android_deps:com_android_support_support_core_utils_java",
-  ]
-  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
-  java_files = [
-    "java/src/org/chromium/chrome/browser/util/BitmapCache.java",
-    "java/src/org/chromium/chrome/browser/util/ConversionUtils.java",
-    "java/src/org/chromium/chrome/browser/util/FileSizeUtil.java",
-    "java/src/org/chromium/chrome/browser/util/KeyNavigationUtil.java",
-    "java/src/org/chromium/chrome/browser/util/MathUtils.java",
-    "java/src/org/chromium/chrome/browser/util/ChromeFileProvider.java",
-    "java/src/org/chromium/chrome/browser/util/UrlConstants.java",
-    "java/src/org/chromium/chrome/browser/util/UrlUtilities.java",
-  ]
-}
-
-generate_jni("jni_headers") {
-  sources = [
-    "java/src/org/chromium/chrome/browser/util/UrlUtilities.java",
+    "//chrome/browser/util/android:java",
   ]
 }