Move chrome/lib/image_fetcher to chrome/browser.

Clank HOA Lite specifies features should be in chrome/browser rather
than chrome/lib.

This is a reland of
https://chromium-review.googlesource.com/c/chromium/src/+/1801803
with the following changes:
https://chromium-review.googlesource.com/c/chromium/src/+/1810767/1..2

This fixes a jni header include which should have been changed in the
original CL to point to the new location.

CQ bots missed this because the generated header persists across
builds in the wrong location, even though it was now being generated
in the new location.

TBR=yfriedman@chromium.org,wylieb@chromium.org,wnwen@chromium.org

Bug: 995916
Change-Id: I4915d2a52a7d877c35486b83fa5d31b840ba5d71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1810767Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Filip Gorski <fgorski@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697689}

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/lib/image_fetcher/public/android:jni_headers",
+    "//chrome/browser/image_fetcher:jni_headers",
     "//chrome/lib/util/public/android:jni_headers",
   ]
 }

chrome/android/features/autofill_assistant/BUILD.gn

@@ -34,8 +34,8 @@ android_library("java") {
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_public_java",
     "//chrome/android/public/profiles:java",
+    "//chrome/browser/image_fetcher:java",
     "//chrome/browser/ui/android/widget: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",
@@ -212,7 +212,7 @@ android_library("test_java") {
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_test_util_java",
-    "//chrome/lib/image_fetcher/public/android:java",
+    "//chrome/browser/image_fetcher:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill_assistant/browser:proto_java",
     "//content/public/android:content_java",

chrome/browser/android/image_fetcher/image_fetcher_bridge.cc

@@ -14,9 +14,9 @@
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/image_fetcher/image_fetcher_service_factory.h"
+#include "chrome/browser/image_fetcher/jni_headers/ImageFetcherBridge_jni.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
-#include "chrome/lib/image_fetcher/public/android/jni_headers/ImageFetcherBridge_jni.h"
 #include "components/image_fetcher/core/cache/image_cache.h"
 #include "components/image_fetcher/core/image_fetcher.h"
 #include "components/image_fetcher/core/image_fetcher_metrics_reporter.h"

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

@@ -13,12 +13,12 @@ android_library("java") {
     "//third_party/gif_player:gif_player_java",
   ]
   java_files = [
-    "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",
+    "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",
   ]
 
   srcjar_deps = [ "//components/image_fetcher/core:java_enums_srcjar" ]
@@ -26,6 +26,6 @@ android_library("java") {
 
 generate_jni("jni_headers") {
   sources = [
-    "java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherBridge.java",
+    "android/java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherBridge.java",
   ]
 }

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

@@ -3,4 +3,5 @@ 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