Revert "Move chrome/lib/image_fetcher to chrome/browser."

This reverts commit 3088e438.

Reason for revert: Breaks android-archive-rel builder https://ci.chromium.org/p/chromium/builders/ci/android-archive-rel/4749

Original change's description:
> Move chrome/lib/image_fetcher to chrome/browser.
> 
> Clank HOA Lite specifies features should be in chrome/browser rather
> than chrome/lib.
> 
> Bug: 995916
> Change-Id: Ie2b91869a46d5fad8ea6daa92f479cacfeedb53d
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1801803
> Reviewed-by: Peter Wen <wnwen@chromium.org>
> Reviewed-by: Brandon Wylie <wylieb@chromium.org>
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#697310}

TBR=yfriedman@chromium.org,wnwen@chromium.org,dtrainor@chromium.org,twellington@chromium.org,wylieb@chromium.org,hnakashima@chromium.org

Change-Id: Ie6064045085362a7accf7c9d18359467873617bc
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 995916
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1808487Reviewed-by: Filip Gorski <fgorski@chromium.org>
Commit-Queue: Filip Gorski <fgorski@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697334}

chrome/android/BUILD.gn

@@ -289,9 +289,9 @@ android_library("chrome_java") {
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
     "//chrome/browser/android/thin_webview:factory_java",
     "//chrome/browser/android/thin_webview:java",
-    "//chrome/browser/image_fetcher:java",
     "//chrome/browser/ui/android/widget:java",
     "//chrome/browser/util/android:java",
+    "//chrome/lib/image_fetcher/public/android:java",
     "//chrome/lib/lifecycle/public/android:java",
     "//chrome/lib/util/public/android:java",
     "//components/autofill/android:autofill_java",
@@ -548,7 +548,7 @@ group("jni_headers") {
     "//chrome/android/features/keyboard_accessory:jni_headers",
     "//chrome/android/features/media_router:jni_headers",
     "//chrome/android/public/profiles:jni_headers",
-    "//chrome/browser/image_fetcher:jni_headers",
+    "//chrome/lib/image_fetcher/public/android:jni_headers",
     "//chrome/lib/util/public/android:jni_headers",
   ]
 }

chrome/android/features/autofill_assistant/BUILD.gn

@@ -34,7 +34,7 @@ android_library("java") {
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_public_java",
     "//chrome/android/public/profiles:java",
-    "//chrome/browser/image_fetcher:java",
+    "//chrome/lib/image_fetcher/public/android:java",
     "//components/policy/android:policy_java",
     "//components/signin/core/browser/android:java",
     "//components/url_formatter/android:url_formatter_java",
@@ -211,7 +211,7 @@ android_library("test_java") {
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_util_java",
-    "//chrome/browser/image_fetcher:java",
+    "//chrome/lib/image_fetcher/public/android:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill_assistant/browser:proto_java",
     "//content/public/android:content_java",

chrome/browser/image_fetcher/DEPS → chrome/lib/image_fetcher/DEPS

@@ -3,5 +3,4 @@ include_rules = [
   "+chrome/android/public/profiles",
 
   "+chrome/lib/util/public",
-  "+content/public/android/java/src/org/chromium/content_public",
 ]

chrome/lib/image_fetcher/OWNERS

+file://components/image_fetcher/OWNERS

chrome/browser/image_fetcher/BUILD.gn → chrome/lib/image_fetcher/public/android/BUILD.gn

@@ -13,12 +13,12 @@ android_library("java") {
     "//third_party/gif_player:gif_player_java",
   ]
   java_files = [
-    "android/java/src/org/chromium/chrome/browser/image_fetcher/CachedImageFetcher.java",
-    "android/java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherBridge.java",
-    "android/java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherFactory.java",
-    "android/java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcher.java",
-    "android/java/src/org/chromium/chrome/browser/image_fetcher/InMemoryCachedImageFetcher.java",
-    "android/java/src/org/chromium/chrome/browser/image_fetcher/NetworkImageFetcher.java",
+    "java/src/org/chromium/chrome/browser/image_fetcher/CachedImageFetcher.java",
+    "java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherBridge.java",
+    "java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherFactory.java",
+    "java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcher.java",
+    "java/src/org/chromium/chrome/browser/image_fetcher/InMemoryCachedImageFetcher.java",
+    "java/src/org/chromium/chrome/browser/image_fetcher/NetworkImageFetcher.java",
   ]
 
   srcjar_deps = [ "//components/image_fetcher/core:java_enums_srcjar" ]
@@ -26,6 +26,6 @@ android_library("java") {
 
 generate_jni("jni_headers") {
   sources = [
-    "android/java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherBridge.java",
+    "java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherBridge.java",
   ]
 }