Always include tab_ui in the public targets

This temporarily removes the restrictions on tab_ui target being only
included in apk builds and make it part of the base at all times.

This CL will be baked in Canary, cherry-picked to 74 and will be
reverted. This is done to disable the DFM for 74.

BUG=951198
investigating install rates. This will be reverted for the next
milestone.

Change-Id: I746a31ed7bc431d22d56de5edb32e7c67a021c8b
Binary-Size: Increase is due to adding a DFM to the base while we are
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1564760Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Yusuf Ozuysal <yusufo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#650474}

chrome/android/BUILD.gn

@@ -2176,12 +2176,6 @@ template("monochrome_or_trichrome_public_bundle_tmpl") {
         },
       ]
     }
-    extra_modules += [
-      {
-        name = "tab_ui"
-        module_target = ":${target_name}__tab_ui_bundle_module"
-      },
-    ]
   }
 }
 

chrome/android/chrome_public_apk_tmpl.gni

@@ -256,13 +256,12 @@ template("chrome_public_common_apk_or_module_tmpl") {
 
     # Features that are shipped in feature modules for bundles but should still
     # be available in the Chrome APK.
-    if (_target_type == "android_apk") {
-      deps += [ "//chrome/android/features/tab_ui:java" ]
-      if (enable_vr) {
-        deps += [ "//chrome/android/features/vr:java" ]
-      }
+    if (_target_type == "android_apk" && enable_vr) {
+      deps += [ "//chrome/android/features/vr:java" ]
     }
 
+    deps += [ "//chrome/android/features/tab_ui:java" ]
+
     if (!defined(version_code)) {
       if (_is_trichrome) {
         version_code = trichrome_version_code

tools/binary_size/libsupersize/describe.py

@@ -485,7 +485,7 @@ class DescriberText(Describer):
 
   def _DescribeDeltaSizeInfo(self, diff):
     common_metadata = {k: v for k, v in diff.before.metadata.iteritems()
-                       if diff.after.metadata[k] == v}
+                       if diff.after.metadata.get(k) == v}
     before_metadata = {k: v for k, v in diff.before.metadata.iteritems()
                        if k not in common_metadata}
     after_metadata = {k: v for k, v in diff.after.metadata.iteritems()