BASELINE: Update Chromium to 78.0.3904.130

Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

17 files changed, 454 insertions, 53 deletions

diff --git a/chromium/chrome/android/features/ar/ar_module.gni b/chromium/chrome/android/features/ar/ar_module.gni
index 8aedb4d819e..59e5c211345 100644
--- a/chromium/chrome/android/features/ar/ar_module.gni
+++ b/chromium/chrome/android/features/ar/ar_module.gni
@@ -6,6 +6,10 @@ import("//device/vr/buildflags/buildflags.gni")
 
 assert(enable_arcore)
 
+_libarcore_dir = get_label_info(
+                     "//third_party/arcore-android-sdk-client:com_google_ar_core_java($default_toolchain)",
+                     "target_out_dir") + "/com_google_ar_core_java/jni"
+
 ar_module_desc = {
   name = "ar"
   java_deps = [
@@ -13,11 +17,7 @@ ar_module_desc = {
     "//third_party/arcore-android-sdk-client:com_google_ar_core_java",
   ]
   android_manifest = "//chrome/android/features/ar/AndroidManifest.xml"
-  loadable_modules_32_bit =
-      [ "$root_gen_dir/third_party/arcore-android-sdk-client/" +
-        "com_google_ar_core_java/jni/armeabi-v7a/libarcore_sdk_c.so" ]
-  loadable_modules_64_bit =
-      [ "$root_gen_dir/third_party/arcore-android-sdk-client/" +
-        "com_google_ar_core_java/jni/arm64-v8a/libarcore_sdk_c.so" ]
+  loadable_modules_32_bit = [ "$_libarcore_dir/armeabi-v7a/libarcore_sdk_c.so" ]
+  loadable_modules_64_bit = [ "$_libarcore_dir/arm64-v8a/libarcore_sdk_c.so" ]
   proguard_async = async_ar
 }
diff --git a/chromium/chrome/android/features/autofill_assistant/BUILD.gn b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
index 34e47102759..0e2b05bdc7a 100644
--- a/chromium/chrome/android/features/autofill_assistant/BUILD.gn
+++ b/chromium/chrome/android/features/autofill_assistant/BUILD.gn
@@ -1,5 +1,5 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
+# Copyright 2019 The Chromium Authors.All rights reserved.
+# Use of this source code is governed by a BSD - style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
@@ -30,6 +30,7 @@ android_library("java") {
   deps = [
     ":java_resources",
     "//base:base_java",
+    "//base:jni_java",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_public_java",
     "//chrome/android/public/profiles:java",
@@ -42,6 +43,8 @@ android_library("java") {
     "//third_party/android_deps:android_arch_lifecycle_common_java",
     "//third_party/android_deps:android_arch_lifecycle_runtime_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:com_android_support_collections_java",
+    "//third_party/android_deps:com_android_support_coordinatorlayout_java",
     "//third_party/android_deps:com_android_support_design_java",
     "//third_party/android_deps:com_android_support_gridlayout_v7_java",
     "//third_party/android_deps:com_android_support_recyclerview_v7_java",
@@ -70,6 +73,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantPeekHeightCoordinator.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantSnackbar.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantTagsForTesting.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/AssistantTextUtils.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantClient.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantModuleEntryImpl.java",
@@ -114,20 +118,23 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDrawable.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayEventFilter.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantChoiceList.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestBinder.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestContactDetailsSection.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestCoordinator.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestDelegate.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestModel.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestNativeDelegate.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestPaymentMethodSection.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestSection.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestShippingAddressSection.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestTermsSection.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantVerticalExpander.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantVerticalExpanderAccordion.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantChoiceList.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataBinder.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantContactDetailsSection.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataCoordinator.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataDelegate.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginChoice.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantLoginSection.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataSection.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataNativeDelegate.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantPaymentMethodSection.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantShippingAddressSection.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantTermsSection.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantVerticalExpander.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantVerticalExpanderAccordion.java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 generate_jni("jni_headers") {
@@ -146,8 +153,8 @@ generate_jni("jni_headers") {
     "java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBoxModel.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayDelegate.java",
     "java/src/org/chromium/chrome/browser/autofill_assistant/overlay/AssistantOverlayModel.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestModel.java",
-    "java/src/org/chromium/chrome/browser/autofill_assistant/payment/AssistantPaymentRequestNativeDelegate.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataModel.java",
+    "java/src/org/chromium/chrome/browser/autofill_assistant/user_data/AssistantCollectUserDataNativeDelegate.java",
   ]
 }
 
@@ -169,9 +176,11 @@ android_library("autofill_assistant_java_test_support") {
   deps = [
     ":java",
     ":test_support_jni_headers",
+    "//base:jni_java",
     "//components/autofill_assistant/browser:proto_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 android_library("test_java") {
@@ -185,8 +194,8 @@ android_library("test_java") {
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantHeaderUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantInfoBoxUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantOverlayUiTest.java",
-    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPaymentRequestTestHelper.java",
-    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPaymentRequestUiTest.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataTestHelper.java",
+    "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTestUtil.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTest.java",
     "javatests/src/org/chromium/chrome/browser/autofill_assistant/AssistantOnboardingCoordinatorTest.java",
@@ -208,6 +217,7 @@ android_library("test_java") {
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java_test_support",
+    "//third_party/android_deps:com_android_support_coordinatorlayout_java",
     "//third_party/android_deps:com_android_support_design_java",
     "//third_party/android_deps:com_android_support_recyclerview_v7_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
diff --git a/chromium/chrome/android/features/dev_ui/BUILD.gn b/chromium/chrome/android/features/dev_ui/BUILD.gn
index d1bd2fddbc6..7185d8eb3c2 100644
--- a/chromium/chrome/android/features/dev_ui/BUILD.gn
+++ b/chromium/chrome/android/features/dev_ui/BUILD.gn
@@ -2,14 +2,31 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/buildflag_header.gni")
 import("//build/config/android/rules.gni")
 import("//chrome/common/features.gni")
+import("dev_ui_module.gni")
 
-android_library("java") {
-  java_files =
-      [ "java/src/org/chromium/chrome/browser/dev_ui/DevUiModuleProvider.java" ]
+# Generate a buildflag header for compile-time checking of Developer Tools DFM.
+buildflag_header("buildflags") {
+  header = "buildflags.h"
+  flags = [ "DFMIFY_DEV_UI=$dfmify_dev_ui" ]
+}
 
+android_library("java") {
   deps = [
     "//base:base_java",
+    "//chrome/android/features/dev_ui/public:java",
+  ]
+  java_files = [ "java/src/org/chromium/chrome/features/dev_ui/DevUiImpl.java" ]
+}
+
+android_assets("pak_assets") {
+  renaming_sources =
+      [ "$root_gen_dir/chrome/bluetooth_internals_resources.pak" ]
+  renaming_destinations = [ "dev_ui_resources.pak" ]
+  deps = [
+    "//chrome/browser/resources/bluetooth_internals:resources",
   ]
+  disable_compression = true
 }
diff --git a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni
index d7143814fc0..683a7197681 100644
--- a/chromium/chrome/android/features/dev_ui/dev_ui_module.gni
+++ b/chromium/chrome/android/features/dev_ui/dev_ui_module.gni
@@ -2,12 +2,17 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/config/android/config.gni")
-
-assert(dfmify_dev_ui)
+declare_args() {
+  # Whether Developer UI (chrome:// pages) should be split into a separate
+  # Dynamic Feature Module (DFM: //docs/android_dynamic_feature_modules.md).
+  dfmify_dev_ui = false
+}
 
 dev_ui_module_desc = {
   name = "dev_ui"
-  java_deps = [ "//chrome/android/features/dev_ui:java" ]
+  java_deps = [
+    "//chrome/android/features/dev_ui:java",
+    "//chrome/android/features/dev_ui:pak_assets",
+  ]
   android_manifest = "//chrome/android/features/dev_ui/java/AndroidManifest.xml"
 }
diff --git a/chromium/chrome/android/features/dev_ui/public/BUILD.gn b/chromium/chrome/android/features/dev_ui/public/BUILD.gn
new file mode 100644
index 00000000000..ce724fc45e3
--- /dev/null
+++ b/chromium/chrome/android/features/dev_ui/public/BUILD.gn
@@ -0,0 +1,18 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+
+android_library("java") {
+  deps = [
+    "//base:base_java",
+    "//components/module_installer/android:module_installer_java",
+    "//components/module_installer/android:module_interface_java",
+  ]
+  java_files = [ "java/src/org/chromium/chrome/features/dev_ui/DevUi.java" ]
+
+  # Need this to generate DevUiModule.java.
+  annotation_processor_deps =
+      [ "//components/module_installer/android:module_interface_processor" ]
+}
diff --git a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
index d149db18bec..1c5b254e830 100644
--- a/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/BUILD.gn
@@ -86,6 +86,7 @@ junit_binary("keyboard_accessory_junit_tests") {
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingControllerTest.java",
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryControllerTest.java",
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessorySheetControllerTest.java",
+    "junit/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessorySheetControllerTest.java",
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetControllerTest.java",
     "junit/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutControllerTest.java",
   ]
@@ -96,8 +97,11 @@ junit_binary("keyboard_accessory_junit_tests") {
     "//base:base_junit_test_support",
     "//chrome/android:chrome_junit_test_support",
     "//chrome/android:chrome_test_util_java",
-    "//components/module_installer/android:module_installer_stub_java",
+    "//components/module_installer/android:module_installer_java",
     "//third_party/junit",
     "//third_party/mockito:mockito_java",
   ]
+
+  srcjar_deps =
+      [ "//components/module_installer/android:module_installer_build_config" ]
 }
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
index 9f44c1d9a55..e21c53ca167 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/BUILD.gn
@@ -9,18 +9,21 @@ android_library("internal_java") {
   deps = [
     ":java_resources",
     "//base:base_java",
+    "//base:jni_java",
 
     # TODO(crbug/951695): Cyclic dependency. Depend on public only when ready.
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_public_java",
     "//chrome/android/features/keyboard_accessory/public:public_java",
     "//chrome/android/public/profiles:java",
+    "//chrome/lib/util/public/android:java",
     "//components/autofill/android:autofill_java",
     "//components/feature_engagement/public:public_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:com_android_support_design_java",
     "//third_party/android_deps:com_android_support_recyclerview_v7_java",
+    "//third_party/android_deps:com_android_support_viewpager_java",
     "//ui/android:ui_java",
     "//ui/android:ui_utils_java",
   ]
@@ -63,8 +66,8 @@ android_library("internal_java") {
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/AddressAccessorySheetViewBinder.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessoryInfoView.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessorySheetCoordinator.java",
-    "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessorySheetMediator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/CreditCardAccessorySheetViewBinder.java",
+    "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/DynamicInfoViewBottomSpacer.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessoryInfoView.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetCoordinator.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/sheet_tabs/PasswordAccessorySheetModernViewBinder.java",
@@ -76,6 +79,7 @@ android_library("internal_java") {
     "java/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutView.java",
     "java/src/org/chromium/chrome/browser/keyboard_accessory/tab_layout_component/KeyboardAccessoryTabLayoutViewBinder.java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 android_resources("java_resources") {
diff --git a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
index 99044d0d7c1..de79a9d5bfa 100644
--- a/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
+++ b/chromium/chrome/android/features/keyboard_accessory/internal/java/strings/android_keyboard_accessory_strings.grd
@@ -103,9 +103,12 @@
   </translations>
   <release allow_pseudo="false" seq="1">
     <messages fallback_to_english="true">
-      <message name="IDS_AUTOFILL_KEYBOARD_ACCESSORY_CONTENT_DESCRIPTION" desc="The text announced by the screen reader when the autofill suggestions are shown.">
+      <message name="IDS_AUTOFILL_KEYBOARD_ACCESSORY_CONTENT_DESCRIPTION" desc="The text announced by the screen reader when the password suggestions are shown.">
         Passwords available
       </message>
+      <message name="IDS_AUTOFILL_KEYBOARD_ACCESSORY_MODERN_CONTENT_DESCRIPTION" desc="The text announced by the screen reader when the autofill suggestions and fallbacks are shown.">
+        Autofill suggestions available
+      </message>
       <message name="IDS_KEYBOARD_ACCESSORY_SHEET_HIDE" desc="Description for the active icon button that closes an accessory sheet and brings back the keyboard.">
           Show keyboard
       </message>
diff --git a/chromium/chrome/android/features/media_router/BUILD.gn b/chromium/chrome/android/features/media_router/BUILD.gn
index 4ba182492cd..a135f63dcd1 100644
--- a/chromium/chrome/android/features/media_router/BUILD.gn
+++ b/chromium/chrome/android/features/media_router/BUILD.gn
@@ -14,9 +14,11 @@ android_library("java") {
     "$google_play_services_package:google_play_services_cast_framework_java",
     "$google_play_services_package:google_play_services_cast_java",
     "//base:base_java",
+    "//base:jni_java",
     "//chrome/android:chrome_java",
     "//services/media_session/public/cpp/android:media_session_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:com_android_support_collections_java",
     "//third_party/android_deps:com_android_support_mediarouter_v7_java",
     "//third_party/android_deps:com_android_support_support_compat_java",
     "//third_party/android_media:android_media_java",
@@ -63,6 +65,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/media/router/caf/remoting/RemotingSessionController.java",
     "java/src/org/chromium/chrome/browser/media/router/caf/remoting/StreamPositionExtrapolator.java",
   ]
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 generate_jni("jni_headers") {
diff --git a/chromium/chrome/android/features/start_surface/internal/BUILD.gn b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
index 76378402bcc..d7192a4c99f 100644
--- a/chromium/chrome/android/features/start_surface/internal/BUILD.gn
+++ b/chromium/chrome/android/features/start_surface/internal/BUILD.gn
@@ -4,6 +4,7 @@
 
 import("//build/config/android/rules.gni")
 import("//chrome/common/features.gni")
+import("//components/feed/features.gni")
 
 java_strings_grd("java_strings_grd") {
   defines = chrome_grit_defines
@@ -67,6 +68,9 @@ java_strings_grd("java_strings_grd") {
 
 android_resources("java_resources") {
   resource_dirs = [ "java/res" ]
+  if (enable_feed_in_chrome) {
+    resource_dirs += [ "java/explore_res" ]
+  }
   deps = [
     ":java_strings_grd",
     "//chrome/android:chrome_app_java_resources",
@@ -77,14 +81,14 @@ android_resources("java_resources") {
 android_library("java") {
   java_files = [
     "java/src/org/chromium/chrome/features/start_surface/BottomBarCoordinator.java",
-    "java/src/org/chromium/chrome/features/start_surface/BottomBarProperties.java",
     "java/src/org/chromium/chrome/features/start_surface/BottomBarView.java",
     "java/src/org/chromium/chrome/features/start_surface/BottomBarViewBinder.java",
-    "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java",
+    "java/src/org/chromium/chrome/features/start_surface/ReturnToStartSurfaceUtil.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceCoordinator.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceDelegate.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceLayout.java",
     "java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java",
+    "java/src/org/chromium/chrome/features/start_surface/StartSurfaceProperties.java",
   ]
 
   deps = [
@@ -95,4 +99,25 @@ android_library("java") {
     "//third_party/android_deps:com_android_support_design_java",
     "//ui/android:ui_full_java",
   ]
+
+  if (enable_feed_in_chrome) {
+    java_files += [
+      "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceActionHandler.java",
+      "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java",
+      "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceNavigationDelegate.java",
+      "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceStreamLifecycleManager.java",
+      "java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceViewBinder.java",
+    ]
+
+    deps += [
+      "//chrome/android/public/profiles:java",
+      "//content/public/android:content_java",
+      "//third_party/android_sdk/androidx_browser:androidx_browser_java",
+      "//third_party/feed:feed_lib_java",
+      "//ui/android:ui_utils_java",
+      "//ui/base/mojom:mojom_java",
+    ]
+  } else {
+    java_files += [ "dummy/java/src/org/chromium/chrome/features/start_surface/ExploreSurfaceCoordinator.java" ]
+  }
 }
diff --git a/chromium/chrome/android/features/tab_ui/BUILD.gn b/chromium/chrome/android/features/tab_ui/BUILD.gn
index c840d48b99b..bfef613e706 100644
--- a/chromium/chrome/android/features/tab_ui/BUILD.gn
+++ b/chromium/chrome/android/features/tab_ui/BUILD.gn
@@ -6,28 +6,84 @@ import("//build/config/android/rules.gni")
 import("//chrome/android/features/tab_ui/buildflags.gni")
 import("//chrome/common/features.gni")
 
+java_strings_grd("java_strings_grd") {
+  defines = chrome_grit_defines
+  grd_file = "java/strings/android_chrome_tab_ui_strings.grd"
+  outputs = [
+    "values/android_chrome_tab_ui_strings.xml",
+    "values-am/android_chrome_tab_ui_strings.xml",
+    "values-ar/android_chrome_tab_ui_strings.xml",
+    "values-bg/android_chrome_tab_ui_strings.xml",
+    "values-bn/android_chrome_tab_ui_strings.xml",
+    "values-ca/android_chrome_tab_ui_strings.xml",
+    "values-cs/android_chrome_tab_ui_strings.xml",
+    "values-da/android_chrome_tab_ui_strings.xml",
+    "values-de/android_chrome_tab_ui_strings.xml",
+    "values-el/android_chrome_tab_ui_strings.xml",
+    "values-en-rGB/android_chrome_tab_ui_strings.xml",
+    "values-es/android_chrome_tab_ui_strings.xml",
+    "values-es-rUS/android_chrome_tab_ui_strings.xml",
+    "values-et/android_chrome_tab_ui_strings.xml",
+    "values-fa/android_chrome_tab_ui_strings.xml",
+    "values-fi/android_chrome_tab_ui_strings.xml",
+    "values-fr/android_chrome_tab_ui_strings.xml",
+    "values-gu/android_chrome_tab_ui_strings.xml",
+    "values-hi/android_chrome_tab_ui_strings.xml",
+    "values-hr/android_chrome_tab_ui_strings.xml",
+    "values-hu/android_chrome_tab_ui_strings.xml",
+    "values-in/android_chrome_tab_ui_strings.xml",
+    "values-it/android_chrome_tab_ui_strings.xml",
+    "values-iw/android_chrome_tab_ui_strings.xml",
+    "values-ja/android_chrome_tab_ui_strings.xml",
+    "values-kn/android_chrome_tab_ui_strings.xml",
+    "values-ko/android_chrome_tab_ui_strings.xml",
+    "values-lt/android_chrome_tab_ui_strings.xml",
+    "values-lv/android_chrome_tab_ui_strings.xml",
+    "values-ml/android_chrome_tab_ui_strings.xml",
+    "values-mr/android_chrome_tab_ui_strings.xml",
+    "values-ms/android_chrome_tab_ui_strings.xml",
+    "values-nb/android_chrome_tab_ui_strings.xml",
+    "values-nl/android_chrome_tab_ui_strings.xml",
+    "values-pl/android_chrome_tab_ui_strings.xml",
+    "values-pt-rBR/android_chrome_tab_ui_strings.xml",
+    "values-pt-rPT/android_chrome_tab_ui_strings.xml",
+    "values-ro/android_chrome_tab_ui_strings.xml",
+    "values-ru/android_chrome_tab_ui_strings.xml",
+    "values-sk/android_chrome_tab_ui_strings.xml",
+    "values-sl/android_chrome_tab_ui_strings.xml",
+    "values-sr/android_chrome_tab_ui_strings.xml",
+    "values-sv/android_chrome_tab_ui_strings.xml",
+    "values-sw/android_chrome_tab_ui_strings.xml",
+    "values-ta/android_chrome_tab_ui_strings.xml",
+    "values-te/android_chrome_tab_ui_strings.xml",
+    "values-th/android_chrome_tab_ui_strings.xml",
+    "values-tl/android_chrome_tab_ui_strings.xml",
+    "values-tr/android_chrome_tab_ui_strings.xml",
+    "values-uk/android_chrome_tab_ui_strings.xml",
+    "values-vi/android_chrome_tab_ui_strings.xml",
+    "values-zh-rCN/android_chrome_tab_ui_strings.xml",
+    "values-zh-rTW/android_chrome_tab_ui_strings.xml",
+  ]
+}
+
 android_resources("java_resources") {
   resource_dirs = [ "java/res" ]
   deps = [
+    ":java_strings_grd",
     "//chrome/android:chrome_app_java_resources",
   ]
   custom_package = "org.chromium.chrome.tab_ui"
 }
 
 android_library("java") {
-  # Add this flag to prevent build hooks to be included in this module
-  # as it's already included in the base module
-  no_build_hooks = true
-
   java_files = [
     "java/src/org/chromium/chrome/browser/tasks/TasksSurfaceCoordinator.java",
+    "java/src/org/chromium/chrome/browser/tasks/TasksView.java",
+    "java/src/org/chromium/chrome/browser/tasks/TasksViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtils.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/ClosableTabGridViewHolder.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/ClosableTabGridView.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/MultiThumbnailCardProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/SelectableTabGridView.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/SelectableTabGridViewHolder.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabCarouselViewHolder.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiColorProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogMediator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogParent.java",
@@ -44,7 +100,6 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetToolbarCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridSheetViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewHolder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiToolbarView.java",
@@ -67,10 +122,14 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripToolbarCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripToolbarViewProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripViewBinder.java",
-    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripViewHolder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherCoordinator.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediator.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabUiColorProvider.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/UndoGroupSnackbarController.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionProvider.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/StaleTabSuggestionProvider.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsRanker.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionProviderConfiguration.java",
   ]
 
   deps = [
@@ -80,7 +139,10 @@ android_library("java") {
     "//chrome/android:chrome_strings_grd",
     "//chrome/android:ui_locale_string_resources",
     "//chrome/android/features/start_surface/internal:java",
+    "//chrome/android/public/profiles:java",
     "//chrome/app:java_strings_grd",
+    "//chrome/lib/lifecycle/public/android:java",
+    "//chrome/lib/util/public/android:java",
     "//components/embedder_support/android:web_contents_delegate_java",
     "//components/feature_engagement:feature_engagement_java",
     "//components/policy/android:policy_java",
@@ -88,6 +150,7 @@ android_library("java") {
     "//content/public/android:content_java_resources",
     "//third_party/android_deps:android_arch_lifecycle_common_java",
     "//third_party/android_deps:android_arch_lifecycle_runtime_java",
+    "//third_party/android_deps:android_arch_lifecycle_viewmodel_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:com_android_support_recyclerview_v7_java",
     "//third_party/android_deps:com_android_support_support_annotations_java",
diff --git a/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
new file mode 100644
index 00000000000..648b62d5244
--- /dev/null
+++ b/chromium/chrome/android/features/tab_ui/java/strings/android_chrome_tab_ui_strings.grd
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- android_chrome_strings.grd contains strings for tab ui DFM of Chrome for Android. -->
+<grit current_release="1" latest_public_release="0" output_all_resource_defines="false">
+  <outputs>
+    <output filename="values-am/android_chrome_tab_ui_strings.xml" lang="am" type="android" />
+    <output filename="values-ar/android_chrome_tab_ui_strings.xml" lang="ar" type="android" />
+    <output filename="values-bg/android_chrome_tab_ui_strings.xml" lang="bg" type="android" />
+    <output filename="values-bn/android_chrome_tab_ui_strings.xml" lang="bn" type="android" />
+    <output filename="values-ca/android_chrome_tab_ui_strings.xml" lang="ca" type="android" />
+    <output filename="values-cs/android_chrome_tab_ui_strings.xml" lang="cs" type="android" />
+    <output filename="values-da/android_chrome_tab_ui_strings.xml" lang="da" type="android" />
+    <output filename="values-de/android_chrome_tab_ui_strings.xml" lang="de" type="android" />
+    <output filename="values-el/android_chrome_tab_ui_strings.xml" lang="el" type="android" />
+    <output filename="values/android_chrome_tab_ui_strings.xml" lang="en" type="android" />
+    <output filename="values-en-rGB/android_chrome_tab_ui_strings.xml" lang="en-GB" type="android" />
+    <output filename="values-es/android_chrome_tab_ui_strings.xml" lang="es" type="android" />
+    <output filename="values-es-rUS/android_chrome_tab_ui_strings.xml" lang="es-419" type="android" />
+    <output filename="values-et/android_chrome_tab_ui_strings.xml" lang="et" type="android" />
+    <output filename="values-fa/android_chrome_tab_ui_strings.xml" lang="fa" type="android" />
+    <output filename="values-fi/android_chrome_tab_ui_strings.xml" lang="fi" type="android" />
+    <output filename="values-gu/android_chrome_tab_ui_strings.xml" lang="fi" type="android" />
+    <output filename="values-tl/android_chrome_tab_ui_strings.xml" lang="fil" type="android" />
+    <output filename="values-fr/android_chrome_tab_ui_strings.xml" lang="fr" type="android" />
+    <output filename="values-hi/android_chrome_tab_ui_strings.xml" lang="hi" type="android" />
+    <output filename="values-hr/android_chrome_tab_ui_strings.xml" lang="hr" type="android" />
+    <output filename="values-hu/android_chrome_tab_ui_strings.xml" lang="hu" type="android" />
+    <output filename="values-in/android_chrome_tab_ui_strings.xml" lang="id" type="android" />
+    <output filename="values-it/android_chrome_tab_ui_strings.xml" lang="it" type="android" />
+    <output filename="values-iw/android_chrome_tab_ui_strings.xml" lang="iw" type="android" />
+    <output filename="values-ja/android_chrome_tab_ui_strings.xml" lang="ja" type="android" />
+    <output filename="values-kn/android_chrome_tab_ui_strings.xml" lang="kn" type="android" />
+    <output filename="values-ko/android_chrome_tab_ui_strings.xml" lang="ko" type="android" />
+    <output filename="values-lt/android_chrome_tab_ui_strings.xml" lang="lt" type="android" />
+    <output filename="values-lv/android_chrome_tab_ui_strings.xml" lang="lv" type="android" />
+    <output filename="values-ml/android_chrome_tab_ui_strings.xml" lang="ml" type="android" />
+    <output filename="values-mr/android_chrome_tab_ui_strings.xml" lang="mr" type="android" />
+    <output filename="values-ms/android_chrome_tab_ui_strings.xml" lang="ms" type="android" />
+    <output filename="values-nl/android_chrome_tab_ui_strings.xml" lang="nl" type="android" />
+    <output filename="values-nb/android_chrome_tab_ui_strings.xml" lang="no" type="android" />
+    <output filename="values-pl/android_chrome_tab_ui_strings.xml" lang="pl" type="android" />
+    <output filename="values-pt-rBR/android_chrome_tab_ui_strings.xml" lang="pt-BR" type="android" />
+    <output filename="values-pt-rPT/android_chrome_tab_ui_strings.xml" lang="pt-PT" type="android" />
+    <output filename="values-ro/android_chrome_tab_ui_strings.xml" lang="ro" type="android" />
+    <output filename="values-ru/android_chrome_tab_ui_strings.xml" lang="ru" type="android" />
+    <output filename="values-sk/android_chrome_tab_ui_strings.xml" lang="sk" type="android" />
+    <output filename="values-sl/android_chrome_tab_ui_strings.xml" lang="sl" type="android" />
+    <output filename="values-sr/android_chrome_tab_ui_strings.xml" lang="sr" type="android" />
+    <output filename="values-sv/android_chrome_tab_ui_strings.xml" lang="sv" type="android" />
+    <output filename="values-sw/android_chrome_tab_ui_strings.xml" lang="sw" type="android" />
+    <output filename="values-ta/android_chrome_tab_ui_strings.xml" lang="ta" type="android" />
+    <output filename="values-te/android_chrome_tab_ui_strings.xml" lang="te" type="android" />
+    <output filename="values-th/android_chrome_tab_ui_strings.xml" lang="th" type="android" />
+    <output filename="values-tr/android_chrome_tab_ui_strings.xml" lang="tr" type="android" />
+    <output filename="values-uk/android_chrome_tab_ui_strings.xml" lang="uk" type="android" />
+    <output filename="values-vi/android_chrome_tab_ui_strings.xml" lang="vi" type="android" />
+    <output filename="values-zh-rCN/android_chrome_tab_ui_strings.xml" lang="zh-CN" type="android" />
+    <output filename="values-zh-rTW/android_chrome_tab_ui_strings.xml" lang="zh-TW" type="android" />
+  </outputs>
+  <translations>
+    <file lang="am" path="translations/android_chrome_tab_ui_strings_am.xtb" />
+    <file lang="ar" path="translations/android_chrome_tab_ui_strings_ar.xtb" />
+    <file lang="bg" path="translations/android_chrome_tab_ui_strings_bg.xtb" />
+    <file lang="bn" path="translations/android_chrome_tab_ui_strings_bn.xtb" />
+    <file lang="ca" path="translations/android_chrome_tab_ui_strings_ca.xtb" />
+    <file lang="cs" path="translations/android_chrome_tab_ui_strings_cs.xtb" />
+    <file lang="da" path="translations/android_chrome_tab_ui_strings_da.xtb" />
+    <file lang="de" path="translations/android_chrome_tab_ui_strings_de.xtb" />
+    <file lang="el" path="translations/android_chrome_tab_ui_strings_el.xtb" />
+    <file lang="en-GB" path="translations/android_chrome_tab_ui_strings_en-GB.xtb" />
+    <file lang="es" path="translations/android_chrome_tab_ui_strings_es.xtb" />
+    <file lang="es-419" path="translations/android_chrome_tab_ui_strings_es-419.xtb" />
+    <file lang="et" path="translations/android_chrome_tab_ui_strings_et.xtb" />
+    <file lang="fa" path="translations/android_chrome_tab_ui_strings_fa.xtb" />
+    <file lang="fi" path="translations/android_chrome_tab_ui_strings_fi.xtb" />
+    <file lang="fil" path="translations/android_chrome_tab_ui_strings_fil.xtb" />
+    <file lang="fr" path="translations/android_chrome_tab_ui_strings_fr.xtb" />
+    <file lang="gu" path="translations/android_chrome_tab_ui_strings_gu.xtb" />
+    <file lang="hi" path="translations/android_chrome_tab_ui_strings_hi.xtb" />
+    <file lang="hr" path="translations/android_chrome_tab_ui_strings_hr.xtb" />
+    <file lang="hu" path="translations/android_chrome_tab_ui_strings_hu.xtb" />
+    <file lang="id" path="translations/android_chrome_tab_ui_strings_id.xtb" />
+    <file lang="it" path="translations/android_chrome_tab_ui_strings_it.xtb" />
+    <file lang="iw" path="translations/android_chrome_tab_ui_strings_iw.xtb" />
+    <file lang="ja" path="translations/android_chrome_tab_ui_strings_ja.xtb" />
+    <file lang="ko" path="translations/android_chrome_tab_ui_strings_ko.xtb" />
+    <file lang="kn" path="translations/android_chrome_tab_ui_strings_kn.xtb" />
+    <file lang="lt" path="translations/android_chrome_tab_ui_strings_lt.xtb" />
+    <file lang="lv" path="translations/android_chrome_tab_ui_strings_lv.xtb" />
+    <file lang="ml" path="translations/android_chrome_tab_ui_strings_ml.xtb" />
+    <file lang="mr" path="translations/android_chrome_tab_ui_strings_mr.xtb" />
+    <file lang="ms" path="translations/android_chrome_tab_ui_strings_ms.xtb" />
+    <file lang="nl" path="translations/android_chrome_tab_ui_strings_nl.xtb" />
+    <file lang="no" path="translations/android_chrome_tab_ui_strings_no.xtb" />
+    <file lang="pl" path="translations/android_chrome_tab_ui_strings_pl.xtb" />
+    <file lang="pt-BR" path="translations/android_chrome_tab_ui_strings_pt-BR.xtb" />
+    <file lang="pt-PT" path="translations/android_chrome_tab_ui_strings_pt-PT.xtb" />
+    <file lang="ro" path="translations/android_chrome_tab_ui_strings_ro.xtb" />
+    <file lang="ru" path="translations/android_chrome_tab_ui_strings_ru.xtb" />
+    <file lang="sk" path="translations/android_chrome_tab_ui_strings_sk.xtb" />
+    <file lang="sl" path="translations/android_chrome_tab_ui_strings_sl.xtb" />
+    <file lang="sr" path="translations/android_chrome_tab_ui_strings_sr.xtb" />
+    <file lang="sv" path="translations/android_chrome_tab_ui_strings_sv.xtb" />
+    <file lang="sw" path="translations/android_chrome_tab_ui_strings_sw.xtb" />
+    <file lang="ta" path="translations/android_chrome_tab_ui_strings_ta.xtb" />
+    <file lang="te" path="translations/android_chrome_tab_ui_strings_te.xtb" />
+    <file lang="th" path="translations/android_chrome_tab_ui_strings_th.xtb" />
+    <file lang="tr" path="translations/android_chrome_tab_ui_strings_tr.xtb" />
+    <file lang="uk" path="translations/android_chrome_tab_ui_strings_uk.xtb" />
+    <file lang="vi" path="translations/android_chrome_tab_ui_strings_vi.xtb" />
+    <file lang="zh-CN" path="translations/android_chrome_tab_ui_strings_zh-CN.xtb" />
+    <file lang="zh-TW" path="translations/android_chrome_tab_ui_strings_zh-TW.xtb" />
+  </translations>
+  <release allow_pseudo="false" seq="1">
+    <messages fallback_to_english="true">
+      <!-- In-Product Help strings -->
+      <message name="IDS_IPH_TAB_GROUPS_QUICKLY_COMPARE_PAGES_TEXT" desc="When Chrome detects that the user is searching or comparing multiple pages (e.g. while comparison shopping), this in-product help text appears at the bottom of the screen. The text informs the user that they can longpress on a link to open it as a new tab within a tab group.">
+        Quickly compare pages by making a group. To start, touch &amp; hold a link.
+      </message>
+      <message name="IDS_IPH_TAB_GROUPS_TAP_TO_SEE_ANOTHER_TAB_TEXT" desc="This in-product help text points to the strip of favicons at the bottom of the page. The favicons indicate all the open tabs within the tab group. The text informs the user that they can tap on any favicon to switch to that tab.">
+        Tap to see another tab
+      </message>
+      <message name="IDS_IPH_TAB_GROUPS_YOUR_TABS_TOGETHER_TEXT" desc="This in-product help text points to a group of tabs within the Tab Switcher. The text informs the user that they can find existing tab groups in the Tab Switcher.">
+        Your tabs are grouped together here
+      </message>
+      <message name="IDS_IPH_TAB_GROUPS_TAP_TO_SEE_ANOTHER_TAB_ACCESSIBILITY_TEXT" desc="This in-product help accessibility text points to the strip of favicons at the bottom of the page. The favicons indicate all the open tabs within the tab group. The text informs the user that they can tap on any favicon to switch to that tab.">
+        Switch between tabs in your tab group near bottom of screen
+      </message>
+
+      <!-- Undo Bar -->
+      <message name="IDS_UNDO_BAR_GROUP_TABS_MESSAGE" desc="Message shown or announced when a group has been created.">
+        <ph name="TAB_COUNT">%1$s<ex>3</ex></ph> tabs grouped
+      </message>
+
+      <!-- Bottom Tab Grid strings -->
+      <message name="IDS_BOTTOM_TAB_GRID_DESCRIPTION" desc="The content description of the 'opened tabs' bottom sheet.">
+        Opened tabs
+      </message>
+      <message name="IDS_BOTTOM_TAB_GRID_OPENED_HALF" desc="Accessibility string read when the 'opened tabs' sheet is opened at half height. The sheet will occupy the bottom half the screen. ">
+        Opened tabs at half height
+      </message>
+      <message name="IDS_BOTTOM_TAB_GRID_OPENED_FULL" desc="Accessibility string read when the 'opened tabs' bottom sheet is opened at full height. The sheet will occupy the entire screen.">
+        Opened tabs at full height
+      </message>
+      <message name="IDS_BOTTOM_TAB_GRID_CLOSED" desc="Accessibility string read when the 'opened tabs' bottom sheet is closed.">
+        Opened tabs closed
+      </message>
+      <message name="IDS_BOTTOM_TAB_GRID_TITLE_PLACEHOLDER" desc="Placeholder string for the BottomTabGrid toolbar title.">
+        <!-- <ph name="TABS_COUNT">%1$d<ex>5</ex></ph> tabs -->
+        {TABS_COUNT, plural,
+            =1 {<ph name="TABS_COUNT_ONE">%1$d<ex>1</ex></ph> tab}
+            other {<ph name="TABS_COUNT_MANY">%1$d<ex>8</ex></ph> tabs}
+        }
+      </message>
+      <message name="IDS_BOTTOM_TAB_GRID_NEW_TAB" desc="Accessibility string for BottomTabGridToolbar option 'create new tab in group' indicated visually by the '+' sign.">
+        Add new tab to group
+      </message>
+      <message name="IDS_ACCESSIBILITY_BOTTOM_TAB_GRID_CLOSE_TAB_SHEET" desc="Accessibility string for BottomTabGridToolbar button indicated visually by the 'v' sign.">
+        Hide fullscreen grid
+      </message>
+
+      <!-- Bottom Tab Strip strings -->
+      <message name="IDS_ACCESSIBILITY_BOTTOM_TAB_STRIP_EXPAND_TAB_SHEET" desc="Accessibility string for BottomTabStripToolbar button indicated visually by the '^' sign.">
+        Show group's tabs in fullscreen grid
+      </message>
+
+      <!-- Tab Group Tab Switcher strings -->
+      <message name="IDS_TABSWITCHER_CREATE_GROUP" desc="This flat button is shown in the Tab Switcher, under an open tab. When the user taps the button, Chrome creates a new group of tabs that includes the existing tab. It's okay to use any of the following verbs in order to keep the text under 45 characters: Create, Make, Add.">
+        Create group
+      </message>
+
+      <!-- Tab Selection Editor strings -->
+      <message name="IDS_TAB_SELECTION_EDITOR_GROUP" desc="This text button is shown in the Tab Selection Editor Toolbar. 'Group' is a verb. When the user taps the button, Chrome creates a new group that contains the selected tabs.">
+        Group
+      </message>
+      <message name="IDS_TAB_SELECTION_EDITOR_TOOLBAR_SELECT_TABS" desc="Label shown on Tab Selection Editor Toolbar asking user to select tabs from the list.">
+        Select tabs
+      </message>
+
+      <!-- Tab Grid Dialog strings -->
+      <message name="IDS_TAB_GRID_DIALOG_REMOVE_FROM_GROUP" desc="This text shows on the ungroup bar in TabGridDialog. When user drags a tab and drops it on the ungroup bar, this tab will be moved out of the group.">
+        Remove from group
+      </message>
+
+      <!-- Tab Grid Drag-and-drop IPH strings -->
+      <message name="IDS_IPH_DRAG_AND_DROP_INTRODUCTION" desc="This text shows on the entry point for the in-product help for drag-and-drop. It introduces that this IPH is about how to use drag-and-drop.">
+        Drag tabs to group them
+      </message>
+      <message name="IDS_IPH_DRAG_AND_DROP_SHOW_ME" desc="This text button shows on the entry point for the in-product help for drag-and-drop. When user clicks on the text button, the dialog for IPH shows up.">
+        Show me
+      </message>
+      <message name="IDS_IPH_DRAG_AND_DROP_TITLE" desc="This text shows on the in-product help dialog for drag-and-drop. It decribes why drag-and-drop is useful.">
+        Get organized
+      </message>
+      <message name="IDS_IPH_DRAG_AND_DROP_CONTENT" desc="This text shows on the in-product help dialog for drag-and-drop. It gives instructions on how to drag and drop to create a group.">
+        To group tabs, touch &amp; hold a tab. Then, drag it onto another tab.
+      </message>
+
+      <!-- Tab Carousel strings -->
+      <message name="IDS_TAB_SWITCHER_CAROUSEL_TITLE" desc="Title of the Tabs carousel section on the single pane start surface.">
+          Continue browsing
+      </message>
+      <message name="IDS_ACCESSIBILITY_TAB_SWITCHER_CAROUSEL_MORE_TABS" desc="Accessibility message of the more Tabs button on the single pane start surface.">
+          More tabs
+      </message>
+    </messages>
+  </release>
+</grit>
diff --git a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
index e524786980c..39da8ecd8af 100644
--- a/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
+++ b/chromium/chrome/android/features/tab_ui/tab_management_java_sources.gni
@@ -7,18 +7,21 @@ import(
 
 public_tab_management_java_sources = [
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurface.java",
-  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_groups/EmptyTabGroupModelFilterObserver.java",
+  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/TasksSurfaceProperties.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilter.java",
-  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/SilenceLintErrors.java",
+  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_groups/EmptyTabGroupModelFilterObserver.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUi.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementDelegate.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabManagementModuleProvider.java",
   "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcher.java",
+  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContext.java",
+  "//chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestion.java",
 ]
 
 public_tab_management_java_sources += start_surface_public_java_sources
 
 tab_management_test_java_sources = [
+  "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/AssertsTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabGridDialogParentTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListContainerViewBinderTest.java",
   "//chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListViewHolderTest.java",
@@ -32,4 +35,6 @@ tab_management_junit_java_sources = [
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGridItemTouchHelperCallbackUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediatorUnitTest.java",
   "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java",
+  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextTests.java",
+  "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/StaleTabSuggestionProviderTest.java",
 ]
diff --git a/chromium/chrome/android/features/test_dummy/internal/BUILD.gn b/chromium/chrome/android/features/test_dummy/internal/BUILD.gn
new file mode 100644
index 00000000000..8b184fecf0f
--- /dev/null
+++ b/chromium/chrome/android/features/test_dummy/internal/BUILD.gn
@@ -0,0 +1,28 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+
+android_library("java") {
+  deps = [
+    "//base:base_java",
+    "//chrome/android/features/test_dummy/public:java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+    "//third_party/android_deps:com_android_support_support_annotations_java",
+  ]
+  java_files =
+      [ "java/src/org/chromium/chrome/features/test_dummy/TestDummyImpl.java" ]
+}
+
+# Code that should go into the base module.
+android_library("base_module_java") {
+  deps = [
+    "//base:base_java",
+    "//chrome/android/modules/test_dummy/provider:java",
+    "//third_party/android_deps:android_support_v7_appcompat_java",
+  ]
+  java_files = [
+    "java/src/org/chromium/chrome/features/test_dummy/TestDummyActivity.java",
+  ]
+}
diff --git a/chromium/chrome/android/features/test_dummy/public/BUILD.gn b/chromium/chrome/android/features/test_dummy/public/BUILD.gn
new file mode 100644
index 00000000000..128169cb979
--- /dev/null
+++ b/chromium/chrome/android/features/test_dummy/public/BUILD.gn
@@ -0,0 +1,10 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/rules.gni")
+
+android_library("java") {
+  java_files =
+      [ "java/src/org/chromium/chrome/features/test_dummy/TestDummy.java" ]
+}
diff --git a/chromium/chrome/android/features/vr/BUILD.gn b/chromium/chrome/android/features/vr/BUILD.gn
index 5ad18c6879c..2eb9621c302 100644
--- a/chromium/chrome/android/features/vr/BUILD.gn
+++ b/chromium/chrome/android/features/vr/BUILD.gn
@@ -117,12 +117,14 @@ android_library("java") {
   deps = [
     ":java_resources",
     "//base:base_java",
+    "//base:jni_java",
     "//chrome/android:chrome_java",
     "//components/policy/android:policy_java",
     "//content/public/android:content_java",
     "//device/vr:java",
     "//third_party/android_deps:android_arch_lifecycle_common_java",
     "//third_party/android_deps:android_arch_lifecycle_runtime_java",
+    "//third_party/android_deps:android_arch_lifecycle_viewmodel_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:com_android_support_support_annotations_java",
     "//third_party/gvr-android-keyboard:kb_java",
@@ -134,6 +136,7 @@ android_library("java") {
   if (async_vr) {
     proguard_configs = [ "//base/android/proguard/chromium_code.flags" ]
   }
+  annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 generate_jni("jni_headers") {
diff --git a/chromium/chrome/android/features/vr/vr_module.gni b/chromium/chrome/android/features/vr/vr_module.gni
index 429f1d7774a..76533bd1166 100644
--- a/chromium/chrome/android/features/vr/vr_module.gni
+++ b/chromium/chrome/android/features/vr/vr_module.gni
@@ -15,9 +15,5 @@ vr_module_desc = {
   if (use_native_modules && modularize_vr_native) {
     native_deps = [ "//chrome/browser/vr:vr_ui" ]
     native_entrypoints = "//chrome/browser/vr/module_exports.lst"
-  } else {
-    # TODO(tiborg): Remove dummy lib and those attributes.
-    loadable_module_dep = "//chrome/browser/android/vr:vr_ui_dummy_lib"
-    loadable_module = "libvr_ui_dummy_lib.so"
   }
 }