Move WebView DevTools launcher icon check to upstream Monochrome only

Move Monochrome WebView DevTools launcher icon component check to public
Monochrome instead of the shared chrome_public_apk_tmpl that is shared
with downstream. This way we can use downstream webview icons in
downstream monochrome instead of using upstream WebView icons all the
time.

This pulls in the icon resource unconditionally, since the resource has
been shrunk.

There are other accidentally added format changes that made by running
`git cl format`.

Bug: 1026060, 1047530
Test: Build downstream and upstream with webview_devui_show_icon=true and observe dev ui icon
Test: du out/Emulator/apks/Monochrome.apk out/Emulator/apks/MonochromePublic.apk
Binary-Size: increase in monochrome is offset by prior decreases in standalone/trichrome
Change-Id: I6733fb901a0874ee2724f05bc621de07401fe73b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2032573
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737564}

android_webview/nonembedded/BUILD.gn

@@ -123,7 +123,6 @@ android_resources("devui_launcher_icon_resources") {
 android_resources("monochrome_devui_launcher_icon_resources") {
   resource_dirs = []
   android_manifest = "java/MonochromeDeveloperUiLauncherManifest.xml"
-  deps = [ ":icon_resources" ]
   custom_package = "org.chromium.android_webview.devui.icon"
 }
 

chrome/android/BUILD.gn

@@ -1771,6 +1771,8 @@ template("monochrome_public_apk_or_module_tmpl") {
       deps += [
         ":monochrome_java",
         "//android_webview:platform_service_bridge_upstream_implementation_java",
+        "//android_webview/nonembedded:icon_resources",
+        "//android_webview/nonembedded:monochrome_devui_launcher_icon_resources",
       ]
       if (webview_includes_weblayer) {
         deps += [ "//weblayer/browser/java:gms_bridge_upstream_impl_java" ]

chrome/android/chrome_public_apk_tmpl.gni

@@ -424,10 +424,6 @@ template("monochrome_public_common_apk_or_module_tmpl") {
         "//chrome/android:monochrome_java",
       ]
 
-      if (webview_devui_show_icon) {
-        _deps += [ "//android_webview/nonembedded:monochrome_devui_launcher_icon_resources" ]
-      }
-
       if (_include_primary_support) {
         _deps += [
           "//android_webview:monochrome_webview_primary_abi_assets",

chrome/android/java/monochrome_public_bundle__base_bundle_module.AndroidManifest.expected

@@ -1048,6 +1048,19 @@
         <data android:scheme="file"/>
       </intent-filter>
     </activity>
+    <activity-alias
+        android:enabled="false"
+        android:exported="true"
+        android:icon="@drawable/icon_webview"
+        android:label="WebView
+        DevTools"
+        android:name="org.chromium.android_webview.devui.MonochromeLauncherActivity"
+        android:targetActivity="org.chromium.android_webview.devui.MainActivity">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity-alias>
     <activity-alias
         android:enabled="false"
         android:name="org.chromium.android_webview.devui.DeveloperModeState"