[WebLayer] Remove android_resources target needed for onResourcesLoaded

We can just use org.chromium.base.onResourcesLoaded to get the same
behavior.

Bug: 1105096
Change-Id: I7303f1ba1e6ea741f0b42bb0aa56a4afb0ee663a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2393005
Auto-Submit: Clark DuVall <cduvall@chromium.org>
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804415}

weblayer/browser/java/BUILD.gn

@@ -45,13 +45,6 @@ android_resources("weblayer_resources") {
   ]
 }
 
-# This resource target is kept in the base module when WebLayer is in a split,
-# and allows WebLayer to call onResourcesLoaded() on resources shared with
-# WebView.
-android_resources("weblayer_base_module_resources") {
-  custom_package = "org.chromium.weblayer_private.base"
-}
-
 generate_product_config_srcjar("weblayer_product_config") {
   java_package = weblayer_product_config_java_package
 }
@@ -88,10 +81,7 @@ java_cpp_enum("generated_enums") {
 android_library("base_module_java") {
   sources =
       [ "org/chromium/weblayer_private/WebViewCompatibilityHelperImpl.java" ]
-  deps = [
-    ":weblayer_base_module_resources",
-    "//base:base_java",
-  ]
+  deps = [ "//base:base_java" ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 

weblayer/browser/java/org/chromium/weblayer_private/WebLayerImpl.java

@@ -468,7 +468,7 @@ public final class WebLayerImpl extends IWebLayer.Stub {
 
         // TODO: The call to onResourcesLoaded() can be slow, we may need to parallelize this with
         // other expensive startup tasks.
-        org.chromium.weblayer_private.base.R.onResourcesLoaded(lightPackageId);
+        org.chromium.base.R.onResourcesLoaded(lightPackageId);
 
         // Wrap the app context so that it can be used to load WebLayer implementation classes.
         appContext = ClassLoaderContextWrapperFactory.get(appContext);