Revert "Move tab_list_ui/ code into its own DFM"

This reverts commit c0b9245.

Reason for revert: breaks build, bug 941226

Original change's description:
> Move tab_list_ui/ code into its own DFM
> 
> BUG=925126
> 
> (cherry picked from commit 02d5848947400d769890ab3bfdf8eb66cd731c4e)
> 
> Change-Id: I7e0f676f4e9e332945d70bedcbcb6f84665a3c80
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1475881
> Reviewed-by: Tommy Nyquist <[email protected]>
> Reviewed-by: Ilya Sherman <[email protected]>
> Reviewed-by: Ted Choc <[email protected]>
> Reviewed-by: Theresa <[email protected]>
> Reviewed-by: Tibor Goldschwendt <[email protected]>
> Commit-Queue: Yusuf Ozuysal <[email protected]>
> Cr-Original-Commit-Position: refs/heads/master@{#639609}
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1519092
> Reviewed-by: Yusuf Ozuysal <[email protected]>
> Cr-Commit-Position: refs/branch-heads/3729@{#62}
> Cr-Branched-From: d4a8972-refs/heads/master@{#638880}

[email protected],[email protected],[email protected],[email protected],[email protected],[email protected]

Change-Id: I473f8fca0da5bc3276d4ffbed466e8357d0a8bc3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 925126
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1519451
Reviewed-by: Krishna Govind <[email protected]>
Cr-Commit-Position: refs/branch-heads/3729@{#71}
Cr-Branched-From: d4a8972-refs/heads/master@{#638880}

chrome/android/BUILD.gn

@@ -9,8 +9,6 @@ import("//build/config/python.gni")
 import("//build/util/process_version.gni")
 import("//chrome/android/chrome_common_shared_library.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
-import("//chrome/android/features/tab_ui/tab_management_java_sources.gni")
-import("//chrome/android/features/tab_ui/tab_ui_module_tmpl.gni")
 import("//chrome/android/features/vr/public_vr_java_sources.gni")
 import("//chrome/android/feed/feed_java_sources.gni")
 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni")
@@ -422,9 +420,6 @@ android_library("chrome_java") {
 
   java_files += public_vr_java_sources
 
-  # Include sources from public_tab_management_java_sources.gni.
-  java_files += public_tab_management_java_sources
-
   if (enable_vr) {
     deps += [
       ":chrome_vr_java_resources",
@@ -590,7 +585,6 @@ junit_binary("chrome_junit_tests") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
-    "//chrome/android/features/tab_ui:java",
     "//chrome/android/webapk/libs/client:client_java",
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/android/webapk/test:junit_test_support",
@@ -693,7 +687,6 @@ android_library("chrome_test_java") {
     "//base:base_java_test_support",
     "//chrome/android:app_hooks_java",
     "//chrome/android:chrome_java",
-    "//chrome/android/features/tab_ui:java",
     "//chrome/android/third_party/compositor_animator:compositor_animator_java",
     "//chrome/android/webapk/libs/client:client_java",
     "//chrome/android/webapk/libs/common:common_java",
@@ -2040,19 +2033,6 @@ template("monochrome_public_bundle_tmpl") {
     }
   }
 
-  tab_ui_module_tmpl("${target_name}__tab_ui_bundle_module") {
-    manifest_package = manifest_package
-    module_name = "TabUiMonochromePublic"
-    base_module_target = ":$_base_module_target_name"
-    if (_is_trichrome) {
-      version_code = trichrome_version_code
-    } else {
-      version_code = monochrome_version_code
-    }
-    version_name = chrome_version_name
-    uncompress_shared_libraries = true
-  }
-
   android_app_bundle(target_name) {
     if (_is_trichrome) {
       add_native_lib_placeholders_for_base_module = true
@@ -2069,7 +2049,7 @@ template("monochrome_public_bundle_tmpl") {
 
     extra_modules = []
     if (modularize_ar) {
-      extra_modules += [
+      extra_modules = [
         {
           name = "ar"
           module_target = ":${target_name}__ar_bundle_module"
@@ -2084,12 +2064,6 @@ template("monochrome_public_bundle_tmpl") {
         },
       ]
     }
-    extra_modules += [
-      {
-        name = "tab_ui"
-        module_target = ":${target_name}__tab_ui_bundle_module"
-      },
-    ]
   }
 }
 

chrome/android/features/module_names_to_package_ids.gni

@@ -2,5 +2,4 @@
 resource_packages_id_mapping = [
   "ar=0x7e",
   "vr=0x7d",
-  "tab_ui=0x7c",
 ]

chrome/android/java/res/layout/bottom_tab_grid_toolbar.xml

@@ -3,7 +3,7 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 
-<org.chromium.chrome.browser.tasks.tab_management.TabGroupUiToolbarView
+<org.chromium.chrome.browser.tasks.tab_list_ui.BottomTabListToolbarView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -37,4 +37,4 @@
             app:tint="@color/standard_mode_tint"
             android:contentDescription="@string/bottom_tab_grid_new_tab" />
    </LinearLayout>
-</org.chromium.chrome.browser.tasks.tab_management.TabGroupUiToolbarView>
+</org.chromium.chrome.browser.tasks.tab_list_ui.BottomTabListToolbarView>