BASELINE: Update Chromium to 57.0.2987.144

Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

8 files changed, 366 insertions, 146 deletions

diff --git a/chromium/chrome/android/BUILD.gn b/chromium/chrome/android/BUILD.gn
index d333ce64fb1..471c74b1993 100644
--- a/chromium/chrome/android/BUILD.gn
+++ b/chromium/chrome/android/BUILD.gn
@@ -164,19 +164,38 @@ java_strings_grd("chrome_strings_grd") {
 
 android_library("chrome_java") {
   deps = [
+    ":chrome_java_resources",
     ":chrome_public_android_manifest",
     ":chrome_public_apk_template_resources",
+    ":document_tab_model_info_proto_java",
     "//base:base_java",
     "//chrome/android/webapk/libs/client:client_java",
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
     "//components/autofill/android:autofill_java",
+    "//components/bookmarks/common/android:bookmarks_java",
+    "//components/dom_distiller/content/browser/android:dom_distiller_content_java",
+    "//components/dom_distiller/core/android:dom_distiller_core_java",
+    "//components/gcm_driver/android:gcm_driver_java",
+    "//components/gcm_driver/instance_id/android:instance_id_driver_java",
+    "//components/invalidation/impl:java",
+    "//components/location/android:location_java",
     "//components/minidump_uploader:minidump_uploader_java",
+    "//components/navigation_interception/android:navigation_interception_java",
+    "//components/ntp_tiles/android:ntp_tiles_java",
     "//components/payments:payment_request_java",
+    "//components/policy/android:policy_java",
+    "//components/precache/android:precache_java",
+    "//components/safe_browsing_db/android:safe_browsing_java",
+    "//components/safe_json/android:safe_json_java",
     "//components/safe_json/android:safe_json_java",
+    "//components/signin/core/browser/android:java",
     "//components/spellcheck/browser/android:java",
+    "//components/sync/android:sync_java",
+    "//components/url_formatter/android:url_formatter_java",
     "//components/variations/android:variations_java",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
+    "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//components/web_restrictions:web_restrictions_java",
     "//content/public/android:content_java",
     "//device/geolocation:geolocation_java",
@@ -190,9 +209,10 @@ android_library("chrome_java") {
     "//printing:printing_java",
     "//services/service_manager/public/interfaces:interfaces_java",
     "//services/service_manager/public/java:service_manager_java",
+    "//services/shape_detection/public/interfaces:interfaces_java",
     "//third_party/WebKit/public:android_mojo_bindings_java",
     "//third_party/WebKit/public:blink_headers_java",
-    "//third_party/WebKit/public:new_wrapper_types_mojo_bindings_java",
+    "//third_party/WebKit/public:mojo_bindings_java",
     "//third_party/android_data_chart:android_data_chart_java",
     "//third_party/android_media:android_media_java",
     "//third_party/android_protobuf:protobuf_nano_javalib",
@@ -211,6 +231,8 @@ android_library("chrome_java") {
     "//third_party/jsr-305:jsr_305_javalib",
     "//third_party/leakcanary:leakcanary_java",
     "//ui/android:ui_java",
+    "//ui/base/mojo:mojo_bindings_java",
+    "//ui/gfx/geometry/mojo:mojo_java",
     "//url/mojo:url_mojom_gurl_java",
     google_play_services_library,
   ]
@@ -226,54 +248,25 @@ android_library("chrome_java") {
     "//chrome:data_use_ui_message_enum_javagen",
     "//chrome:signin_metrics_enum_javagen",
     "//chrome:quick_action_category_enum_javagen",
+    "//chrome:page_info_connection_type_javagen",
+    "//chrome:website_settings_action_javagen",
+    "//components/browsing_data/core:browsing_data_utils_java",
+    "//components/infobars/core:infobar_enums_java",
+    "//components/ntp_snippets:ntp_snippets_java_enums_srcjar",
+    "//components/ntp_tiles:ntp_tiles_enums_java",
+    "//components/offline_pages/core:offline_page_model_enums_java",
+    "//components/omnibox/browser:autocomplete_match_javagen",
+    "//components/omnibox/browser:autocomplete_match_type_javagen",
+    "//components/security_state/core:security_state_enums_java",
+    "//components/signin/core/browser:investigated_scenario_java",
+    "//components/supervised_user_error_page:enums_srcjar",
   ]
 
   # Manifest used for linting (determining unused resources).
   android_manifest = chrome_public_android_manifest
 
-  # TODO(sievers): Split java code into components. Not everything
-  # is really all that UI related here.
-  if (android_java_ui) {
-    # From java_sources.gni.
-    java_files = chrome_java_sources
-
-    srcjar_deps += [
-      "//chrome:page_info_connection_type_javagen",
-      "//chrome:website_settings_action_javagen",
-      "//components/browsing_data/core:browsing_data_utils_java",
-      "//components/infobars/core:infobar_enums_java",
-      "//components/ntp_snippets:ntp_snippets_java_enums_srcjar",
-      "//components/ntp_tiles:ntp_tiles_enums_java",
-      "//components/offline_pages:offline_page_model_enums_java",
-      "//components/omnibox/browser:autocomplete_match_javagen",
-      "//components/omnibox/browser:autocomplete_match_type_javagen",
-      "//components/security_state/core:security_state_enums_java",
-      "//components/signin/core/browser:investigated_scenario_java",
-    ]
-
-    deps += [
-      ":chrome_java_resources",
-      ":document_tab_model_info_proto_java",
-      "//blimp/client/public:public_java",
-      "//components/bookmarks/common/android:bookmarks_java",
-      "//components/dom_distiller/content/browser/android:dom_distiller_content_java",
-      "//components/dom_distiller/core/android:dom_distiller_core_java",
-      "//components/gcm_driver/android:gcm_driver_java",
-      "//components/gcm_driver/instance_id/android:instance_id_driver_java",
-      "//components/invalidation/impl:java",
-      "//components/location/android:location_java",
-      "//components/navigation_interception/android:navigation_interception_java",
-      "//components/ntp_tiles/android:ntp_tiles_java",
-      "//components/policy/android:policy_java",
-      "//components/precache/android:precache_java",
-      "//components/safe_json/android:safe_json_java",
-      "//components/signin/core/browser/android:java",
-      "//components/sync/android:sync_java",
-      "//components/url_formatter/android:url_formatter_java",
-      "//components/web_contents_delegate_android:web_contents_delegate_android_java",
-      "//ui/base/mojo:mojo_bindings_java",
-    ]
-  }
+  # From java_sources.gni.
+  java_files = chrome_java_sources
 
   if (enable_vr_shell || enable_webvr) {
     java_files += chrome_vr_java_sources
@@ -302,6 +295,7 @@ java_cpp_enum("chrome_android_java_enums_srcjar") {
     "//chrome/browser/android/tab_android.h",
     "//chrome/browser/banners/app_banner_settings_helper.h",
     "//chrome/browser/notifications/notification_platform_bridge_android.cc",
+    "//chrome/browser/ntp_snippets/ntp_snippets_metrics.h",
     "//chrome/browser/profiles/profile_metrics.h",
     "//chrome/browser/ui/android/infobars/infobar_android.h",
   ]
@@ -348,6 +342,7 @@ junit_binary("chrome_junit_tests") {
     "//device/geolocation:geolocation_java",
     "//net/android:net_java",
     "//third_party/WebKit/public:blink_headers_java",
+    "//third_party/WebKit/public:mojo_bindings_java",
     "//third_party/android_tools:android_support_annotations_java",
     "//third_party/android_tools:android_support_v7_mediarouter_java",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
@@ -395,6 +390,7 @@ android_library("chrome_test_java") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
+    "//chrome/android/webapk/libs/client:client_java",
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
     "//chrome/test/android:chrome_java_test_support",
@@ -434,6 +430,8 @@ android_library("chrome_test_java") {
     "//printing:printing_java",
     "//third_party/WebKit/public:android_mojo_bindings_java",
     "//third_party/WebKit/public:blink_headers_java",
+    "//third_party/WebKit/public:mojo_bindings_java",
+    "//third_party/android_support_test_runner:runner_java",
     "//third_party/android_tools:android_support_design_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
@@ -455,6 +453,7 @@ android_library("chrome_test_java") {
     "//chrome/test/data/image_search/valid.png",
     "//chrome/test/data/navigation_interception/",
     "//chrome/test/data/notifications/",
+    "//chrome/test/data/payments/",
     "//chrome/test/data/popup_blocker/",
     "//chrome/test/data/push_messaging/",
     "//chrome/test/data/translate/",
@@ -462,8 +461,10 @@ android_library("chrome_test_java") {
     "//content/test/data/android/geolocation.html",
     "//content/test/data/android/media_permissions.html",
     "//content/test/data/android/webshare.html",
+    "//content/test/data/media/bear.webm",
     "//content/test/data/media/getusermedia.html",
     "//content/test/data/media/session/",
+    "//content/test/data/media/video-player.html",
     "//content/test/data/media/webrtc_test_utilities.js",
   ]
 
@@ -669,7 +670,6 @@ template("chrome_public_apk_tmpl_shared") {
       deps = []
     }
 
-    native_lib_version_rule = "//build/util:chrome_version_json"
     deps += [
       ":chrome_java",
       ":chrome_public_apk_resources",
@@ -753,6 +753,7 @@ instrumentation_test_apk("chrome_public_test_apk") {
     ":chrome_test_java",
     "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests",
     "//chrome/android/webapk/shell_apk:shell_apk_javatests",
+    "//third_party/android_support_test_runner:runner_java",
   ]
   additional_apks = [
     "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service:apk_with_webapk_service",
@@ -783,6 +784,7 @@ android_library("chrome_sync_shell_test_apk_java") {
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_protobuf:protobuf_nano_javalib",
+    "//third_party/android_support_test_runner:runner_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//ui/android:ui_java",
   ]
@@ -795,6 +797,7 @@ instrumentation_test_apk("chrome_sync_shell_test_apk") {
   android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
   deps = [
     ":chrome_sync_shell_test_apk_java",
+    "//third_party/android_support_test_runner:runner_java",
   ]
   proguard_enabled = !is_java_debug
 }
diff --git a/chromium/chrome/android/chrome_public_apk_tmpl.gni b/chromium/chrome/android/chrome_public_apk_tmpl.gni
index 5c98830dc8f..01d5f66a4c1 100644
--- a/chromium/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chromium/chrome/android/chrome_public_apk_tmpl.gni
@@ -4,6 +4,7 @@
 
 import("//base/android/linker/config.gni")
 import("//build/config/android/rules.gni")
+import("//build/config/locales.gni")
 import("//chrome/common/features.gni")
 import("//third_party/leakcanary/config.gni")
 import("channel.gni")
@@ -40,6 +41,10 @@ template("chrome_public_apk_tmpl") {
     _native_lib_file =
         rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
     native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
+    native_lib_version_rule = "//build/util:chrome_version_json"
+    if (!defined(aapt_locale_whitelist)) {
+      aapt_locale_whitelist = locales - android_chrome_omitted_locales
+    }
 
     if (is_java_debug) {
       enable_multidex = true
@@ -98,9 +103,14 @@ template("monochrome_public_apk_tmpl") {
     enable_relocation_packing = true
     extensions_to_not_compress = ".lpak,.pak,.bin,.dat"
 
+    # Webview supports all locales (has no omitted ones).
+    aapt_locale_whitelist = locales
+
+    # Incremental install doesn't work for monochrome. See crbug.com/663492.
+    never_incremental = true
+
     # Configrations to make android load shared library from APK.
     uncompress_shared_libraries = true
-    page_align_shared_libraries = true
 
     forward_variables_from(invoker, "*")
 
diff --git a/chromium/chrome/android/java/strings/android_chrome_strings.grd b/chromium/chrome/android/java/strings/android_chrome_strings.grd
index 957a726221a..6a0ee7bd5f8 100644
--- a/chromium/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chromium/chrome/android/java/strings/android_chrome_strings.grd
@@ -203,6 +203,12 @@ CHAR-LIMIT guidelines:
       <message name="IDS_SHARE" desc="Content description for a button to share item(s). [CHAR-LIMIT=20]">
         Share
       </message>
+      <message name="IDS_SEARCH" desc="The label for a search button.">
+        Search
+      </message>
+      <message name="IDS_COPY_LINK" desc="The label for a menu item to copy a link. [CHAR-LIMIT=30]">
+        Copy link
+      </message>
 
       <!-- Main Preferences -->
       <message name="IDS_PREFERENCES" desc="Title for Chrome's Settings.">
@@ -243,6 +249,9 @@ CHAR-LIMIT guidelines:
       <message name="IDS_SIGN_IN_GOOGLE_ACTIVITY_CONTROLS_MESSAGE" desc="Message of Google activity controls preference in signed in accounts settings screen">
         Control how Google uses your browsing history to personalize Search, ads, and other Google services.
       </message>
+      <message name="IDS_SIGN_IN_GOOGLE_ACTIVITY_CONTROLS_MESSAGE_CHILD_ACCOUNT" desc="Message of Google activity controls preference in signed in accounts settings screen for child accounts">
+        Control how Google uses your browsing history to personalize Search and other Google services.
+      </message>
       <message name="IDS_SIGN_IN_SYNC_ERROR_WIDGET" desc="Accessibility description of the sync error widget in settings screen">
         Sync error occurred, tap to get details.
       </message>
@@ -257,6 +266,9 @@ CHAR-LIMIT guidelines:
       <message name="IDS_SEARCH_ENGINE_LOCATION_BLOCKED" desc="The text of a link displayed when location permission for a particular search engine is blocked.">
         Location is blocked
       </message>
+      <message name="IDS_SEARCH_ENGINE_RECENTLY_VISITED" desc="Header for the list of recently visited search engines.">
+        Recently visited
+      </message>
 
       <!-- Autofill preferences -->
       <message name="IDS_PREFS_AUTOFILL" desc="Title for 'Autofill forms' settings, which control what personal data can be automatically filled into web page forms. [CHAR-LIMIT=32]">
@@ -323,9 +335,6 @@ CHAR-LIMIT guidelines:
       <message name="IDS_PREFS_SAVED_PASSWORDS" desc="Title for the Saved Passwords preferences. [CHAR-LIMIT=32]">
         Save passwords
       </message>
-      <message name="IDS_PREFS_SMART_LOCK_FOR_PASSWORDS" desc="The brand name of the password manager to be displayed in preferences instead of the title 'Save Passwords' when a user is signed in. [CHAR-LIMIT=32]">
-        Smart Lock for Passwords
-      </message>
       <message name="IDS_PASSWORDS_AUTO_SIGNIN_TITLE" desc="Title for checkbox to enable automatically signing the user in to websites">
         Auto Sign-in
       </message>
@@ -534,6 +543,21 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_CLEAR_BROWSING_DATA_IMPORTANT_DIALOG_BUTTON" desc="The text of the button to perform the clear action in the dialog presenting the user with 'important' sites that they can exclude from clearing.">
         Clear
       </message>
+      <message name="IDS_OPEN_CLEAR_BROWSING_DATA_DIALOG_BUTTON" desc="Title of the button that will open the clear browsing data dialog.">
+        Clear browsing data…
+      </message>
+      <message name="IDS_ANDROID_HISTORY_NO_SYNCED_RESULTS" desc="The notification at the top of the history page indicating that it does not include visits from other devices.">
+        Showing history from this device. <ph name="BEGIN_LINK">&lt;link&gt;</ph>Learn more<ph name="END_LINK">&lt;/link&gt;</ph>.
+      </message>
+      <message name="IDS_ANDROID_HISTORY_HAS_SYNCED_RESULTS" desc="The notification at the top of the history page indicating that it is showing visits synced from other devices.">
+        Showing history from your signed-in devices. <ph name="BEGIN_LINK">&lt;link&gt;</ph>Learn more<ph name="END_LINK">&lt;/link&gt;</ph>.
+      </message>
+      <message name="IDS_ANDROID_HISTORY_OTHER_FORMS_OF_HISTORY" desc="The notification at the top of the history page indicating that deleting Chrome browsing history will not delete other forms of history stored at Google My Activity.">
+        Your Google Account may have other forms of browsing history at <ph name="BEGIN_LINK">&lt;link&gt;</ph>history.google.com<ph name="END_LINK">&lt;/link&gt;</ph>.
+      </message>
+      <message name="IDS_ANDROID_HISTORY_BLOCKED_SITE" desc="The text displayed in the history page indicating that a visit to a web site was blocked due to an administrator policy.">
+        Blocked site
+      </message>
 
       <message name="IDS_USAGE_AND_CRASH_REPORTS_TITLE" desc="Title for 'Usage and crash reports' preference">
         Usage and crash reports
@@ -581,9 +605,6 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_JAVASCRIPT_PERMISSION_TITLE" desc="Title of the permission to run javascript [CHAR-LIMIT=32]">
         JavaScript
       </message>
-      <message name="IDS_KEYGEN_PERMISSION_TITLE" desc="Title of the permission to allow a form to perform client-side key generation [CHAR-LIMIT=32]">
-        Key generation
-      </message>
       <message name="IDS_MEDIA_PERMISSION_TITLE" desc="Title of the menu containing the media permissions [CHAR-LIMIT=32]">
         Media
       </message>
@@ -707,11 +728,14 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_WEBSITE_SETTINGS_PERMISSIONS_BLOCK" desc="Summary text explaining that Chrome will block a website from accessing some permission, e.g. JavaScript: block.">
         Block
       </message>
-      <message name="IDS_WEBSITE_SETTINGS_PERMISSIONS_ALLOW_DSE" desc="Summary text explaining that Chrome will allow the default search engine to access the user's location, but only when the user searches directly from the address bar. e.g. Location access: Allow (for address bar searches)">
+      <message name="IDS_WEBSITE_SETTINGS_PERMISSIONS_ALLOW_DSE_ADDRESS_BAR" desc="Summary text explaining that Chrome will allow the default search engine to access the user's location, but only when the user searches directly from the address bar. e.g. Location access: Allow (for address bar searches)">
         Allow (for address bar searches)
       </message>
-      <message name="IDS_WEBSITE_SETTINGS_SEARCH" desc="The label for the search button on the Website Settings page.">
-        Search
+      <message name="IDS_WEBSITE_SETTINGS_PERMISSIONS_ALLOW_DSE" desc="Summary text explaining that Chrome will allow the default search engine to access the user's location, both when performed from the address bar and from Google search result pages. e.g. Location access: Allow for Google searches">
+        Allow for current search engine
+      </message>
+      <message name="IDS_WEBSITE_SETTINGS_PERMISSIONS_BLOCK_DSE" desc="Summary text explaining that Chrome will allow the default search engine to access the user's location, both when performed from the address bar and from Google search result pages. e.g. Location access: Allow for Google searches">
+        Block for current search engine
       </message>
       <message name="IDS_WEBSITE_RESET" desc="The label for the button allowing users to clear all data and reset the permissions for a website.">
         Clear &amp; reset
@@ -857,10 +881,10 @@ To obtain new licenses, connect to the internet and play your downloaded content
 
       <!-- Data Saver Promo and FRE card -->
       <message name="IDS_DATA_REDUCTION_PROMO_TITLE" desc="The title for the promo inviting users to enable Data Saver" >
-        Browse more for less
+        Save data and browse faster
       </message>
       <message name="IDS_DATA_REDUCTION_PROMO_SUMMARY" desc="Description for the promo inviting users to enable Data Saver" >
-        Spend less on data by using Google to optimize the pages you visit. Pages accessed using private connections (HTTPS) or in Incognito tabs will not be optimized or seen by Google.
+        Use up to 60% less data and speed up the web. Google servers will optimize the pages you visit.
       </message>
       <message name="IDS_DATA_REDUCTION_ENABLE_BUTTON" desc="Button the user presses if they want to enable Data Saver" >
         Turn on Data Saver
@@ -928,9 +952,6 @@ To obtain new licenses, connect to the internet and play your downloaded content
       </message>
 
       <!-- Child accounts -->
-      <message name="IDS_KIDS_ACCOUNT" desc="Identifies an account as a child account.">
-        This is a kid’s account
-      </message>
       <message name="IDS_ACCOUNT_MANAGEMENT_PARENTAL_SETTINGS" desc="Title of parental settings section of account page for child account.">
         Parental Settings
       </message>
@@ -947,14 +968,15 @@ To obtain new licenses, connect to the internet and play your downloaded content
         Content
       </message>
       <message name="IDS_ACCOUNT_MANAGEMENT_CHILD_CONTENT_APPROVED" desc="Setting that permits child accounts to visit only sites approved by their parents.">
-        Only approved sites
+        Only allow certain sites
       </message>
-      <message name="IDS_ACCOUNT_MANAGEMENT_CHILD_CONTENT_ALL" desc="Setting that permits child accounts to visit any websites.">
-        Uncontrolled
+      <message name="IDS_ACCOUNT_MANAGEMENT_CHILD_CONTENT_FILTER_MATURE" desc="Setting that permits child accounts to visit any websites that don't have mature contents. As the filter is not perfect, the browser can only attempt to block these sites.">
+        Try to block mature sites
       </message>
-      <message name="IDS_ACCOUNT_MANAGEMENT_CHILD_SAFE_SITES_TITLE" desc="Title of Google SafeSites, which blocks inappropriate or explicit websites.">
-        Google SafeSites filter
+      <message name="IDS_ACCOUNT_MANAGEMENT_CHILD_CONTENT_ALL" desc="Setting that permits child accounts to visit any websites.">
+        Allow all sites
       </message>
+
       <message name="IDS_POWERED_BY_CHROME_MESSAGE" desc="A message indicating that the current page is running in Chrome.">
         Powered by Chrome
       </message>
@@ -1172,29 +1194,23 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_SYNC_LOADING" desc="Preference title to let the user change their encryption password. [CHAR-LIMIT=20]">
         Loading…
       </message>
-      <message name="IDS_SYNC_IMPORT_DATA_TITLE" desc="Preference title of screen to let user choose to switch sync accounts. [CHAR-LIMIT=24]">
-        Import data?
-      </message>
-      <message name="IDS_SYNC_IMPORT_DATA_PROMPT_SWITCHING_ACCOUNTS" desc="Prompt for the user to choose how they want to handle their existing sync data">
-        You’re switching sync accounts from <ph name="FROM_ACCOUNT">%2$s<ex>johndoe@old.com</ex></ph> to <ph name="TO_ACCOUNT">%1$s<ex>johndoe@new.com</ex></ph>. What do you want to do with your existing bookmarks, history, passwords and other settings?
-      </message>
-      <message name="IDS_SYNC_IMPORT_DATA_PROMPT_EXISTING_DATA" desc="Prompt for the user to choose how they want to handle their existing sync data">
-        You’re signing in to <ph name="TO_ACCOUNT">%1$s<ex>johndoe@new.com</ex></ph>. Some of your existing bookmarks, history, passwords, and other settings were previously synced to <ph name="FROM_ACCOUNT">%2$s<ex>johndoe@old.com</ex></ph>. What do you want to do with your existing data?
+      <message name="IDS_SYNC_IMPORT_DATA_PROMPT" desc="Prompt for the user to choose how they want to handle their existing sync data">
+         You have bookmarks, history, passwords, and other settings from <ph name ="FROM_ACCOUNT">%1$s<ex>johndoe@old.com</ex></ph>.
       </message>
       <message name="IDS_SYNC_IMPORT_EXISTING_DATA" desc="Option to import existing data to the newly selected sync account">
-        Import existing data
+        Combine my data
       </message>
       <message name="IDS_SYNC_IMPORT_EXISTING_DATA_SUBTEXT" desc="Subtext describing what happens if the user elects to import existing data to the newly selected sync account">
-        Keep existing data on your device and permanently import the data to <ph name="TO_ACCOUNT">%1$s<ex>johndoe@new.com</ex></ph>.
+        Add existing data to <ph name="TO_ACCOUNT">%1$s<ex>johndoe@new.com</ex></ph>.
       </message>
       <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE" desc="Option to keep the existing data separate from the newly selected sync account">
-        Keep existing data separate
+        Keep my data separate
       </message>
       <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE_SUBTEXT_EXISTING_DATA" desc="Subtext describing what happens if the user elects to keep the existing data separate signing into a new account after have previously being signed into a different account then signed out.">
-        Replace this device’s data with <ph name="TO_ACCOUNT">%1$s<ex>johndoe@new.com</ex></ph>’s data. You can retrieve your existing data by switching back to <ph name="FROM_ACCOUNT">%2$s<ex>johndoe@old.com</ex></ph>, but data created since you signed out will be lost.
+        Delete existing data.
       </message>
       <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE_SUBTEXT_SWITCHING_ACCOUNTS" desc="Subtext describing what happens if the user elects to keep the existing data separate when switching sync accounts.">
-        Replace this device’s data with <ph name="TO_ACCOUNT">%1$s<ex>johndoe@new.com</ex></ph>’s data. You can retrieve your existing data by switching back to <ph name="FROM_ACCOUNT">%2$s<ex>johndoe@old.com</ex></ph>.
+        Delete existing data. You can retrieve it by switching back to <ph name="FROM_ACCOUNT">%1$s<ex>johndoe@old.com</ex></ph>.
       </message>
 
       <!-- Bluetooth Picker UI strings -->
@@ -1206,20 +1222,17 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_BLUETOOTH_CONFIRM_BUTTON" desc="The button to confirm association of a website with a Bluetooth device. Use the same term as in 'Pair this Bluetooth headset with your phone.'">
         Pair
       </message>
-      <message name="IDS_BLUETOOTH_NOT_SEEING_IT" desc="The message to show at the bottom of the dialog when Bluetooth scanning has uncovered some items but is still scanning for others.">
-        <ph name="BEGIN_LINK">&lt;link&gt;</ph>Get help<ph name="END_LINK">&lt;/link&gt;</ph> while scanning for devices…
-      </message>
-      <message name="IDS_BLUETOOTH_NOT_SEEING_IT_IDLE_NONE_FOUND" desc="The message to show at the bottom of the dialog when Bluetooth scanning has not uncovered any devices and it is no longer discovering devices.">
-        <ph name="BEGIN_LINK1">&lt;link1&gt;</ph>Get help<ph name="END_LINK1">&lt;/link1&gt;</ph> or <ph name="BEGIN_LINK2">&lt;link2&gt;</ph>re-scan<ph name="END_LINK2">&lt;/link2&gt;</ph>
-      </message>
-      <message name="IDS_BLUETOOTH_NOT_SEEING_IT_IDLE_SOME_FOUND" desc="The message to show at the bottom of the dialog when Bluetooth scanning has uncovered some items but is no longer discovering devices. Allows the user to restart the scan, in case their device is not listed.">
+      <message name="IDS_BLUETOOTH_NOT_SEEING_IT_IDLE" desc="The message to show at the bottom of the dialog when Bluetooth scanning has uncovered some items but is no longer discovering devices. Allows the user to restart the scan, in case their device is not listed.">
         <ph name="BEGIN_LINK1">&lt;link1&gt;</ph>Get help<ph name="END_LINK1">&lt;/link1&gt;</ph> or <ph name="BEGIN_LINK2">&lt;link2&gt;</ph>re-scan<ph name="END_LINK2">&lt;/link2&gt;</ph>
       </message>
       <message name="IDS_BLUETOOTH_NOT_FOUND" desc="The message to show when no items were found during Bluetooth device scanning.">
         No Bluetooth devices found
       </message>
       <message name="IDS_BLUETOOTH_ADAPTER_OFF" desc="The message to show when scanning cannot start because the bluetooth adapter is turned off.">
-        Turn on Bluetooth in <ph name="BEGIN_LINK">&lt;link&gt;</ph>device settings<ph name="END_LINK">&lt;/link&gt;</ph> to allow pairing
+        <ph name="BEGIN_LINK">&lt;link&gt;</ph>Turn on Bluetooth<ph name="END_LINK">&lt;/link&gt;</ph> to allow pairing
+      </message>
+      <message name="IDS_BLUETOOTH_UNABLE_TO_TURN_ON_ADAPTER" desc="The message to show when Chrome is unable to turn on the Bluetooth adapter.">
+          Chrome is unable to turn on Bluetooth adapter
       </message>
       <message name="IDS_BLUETOOTH_ADAPTER_OFF_HELP" desc="The status message to show along with the message when the bluetooth adapter is turned off (to get Help).">
         <ph name="BEGIN_LINK">&lt;link&gt;</ph>Get help<ph name="END_LINK">&lt;/link&gt;</ph>
@@ -1439,8 +1452,17 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_CONTEXTMENU_OPEN_IN_INCOGNITO_TAB" desc="Context sensitive menu item to open the selected link in a new incognito tab. [CHAR-LIMIT=30]">
         Open in incognito tab
       </message>
-      <message name="IDS_CONTEXTMENU_COPY_EMAIL_ADDRESS" desc="Context sensitive menu item for copying email address. [CHAR-LIMIT=30]">
-        Copy email address
+      <message name="IDS_CONTEXTMENU_CALL" desc="Context sensitive menu for calling phone number. [CHAR-LIMIT=30]">
+        Call
+      </message>
+      <message name="IDS_CONTEXTMENU_COPY" desc="Context sensitive menu item for copying email address/phone number. [CHAR-LIMIT=30]">
+        Copy
+      </message>
+      <message name="IDS_CONTEXTMENU_SEND_MESSAGE" desc="Context sensitive menu item for sending an email message. [CHAR-LIMIT=30]">
+        Send message
+      </message>
+      <message name="IDS_CONTEXTMENU_ADD_TO_CONTACTS" desc="Context sensitive menu item for adding an email address to contacts. [CHAR-LIMIT=30]">
+        Add to contacts
       </message>
       <message name="IDS_CONTEXTMENU_COPY_LINK_ADDRESS" desc="Context sensitive menu item for copying the selected link URL / address. [CHAR-LIMIT=30]">
         Copy link address
@@ -1568,6 +1590,9 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_FAIL_TO_INSTALL_WEBAPK" desc="The installation of a WebAPK fails. [CHAR-LIMIT=27]">
         Unable to add
       </message>
+      <message name="IDS_WEBAPK_INSTALL_IN_PROGRESS" desc="Indicates that an installation for the WebAPK for the specific website is already in progress.">
+        Still adding previous site
+      </message>
 
       <!-- WebsiteSettingsPopup (PageInfo dialog) -->
       <message name="IDS_PAGE_INFO_SITE_SETTINGS_BUTTON" desc="Text in the button that opens a website's Site Settings from the Page Info dialog.">
@@ -1576,6 +1601,12 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_PAGE_INFO_INSTANT_APP_BUTTON" desc="Text in the button that opens an Android Instant app that is associated with the website's URL.">
         Open Instant App
       </message>
+      <message name="IDS_PAGE_INFO_DSE_PERMISSION_ALLOWED" desc="The label used in the Page Info dialog to describe an allowed location permission for the current search engine. Eg: Location - Allowed for current search engine">
+        Allowed for current search engine
+      </message>
+      <message name="IDS_PAGE_INFO_DSE_PERMISSION_BLOCKED" desc="The label used in the Page Info dialog to describe a blocked location permission for the current search engine. Eg: Location - Blocked for current search engine">
+        Blocked for current search engine
+      </message>
       <message name="IDS_PAGE_INFO_PERMISSION_ALLOWED" desc="The label used in the Page Info dialog to describe an allowed permission. Eg: Location - Allowed">
         Allowed
       </message>
@@ -1640,7 +1671,7 @@ To obtain new licenses, connect to the internet and play your downloaded content
         Download paused
       </message>
       <message name="IDS_DOWNLOAD_NOTIFICATION_PENDING" desc="Download notification to be displayed when a download has been scheduled but has not started being fetched from the network.">
-        Download pending...
+        Download pending…
       </message>
       <message name="IDS_DOWNLOAD_CANT_OPEN_FILE" desc="Toast that appears when a downloaded file can't be opened.">
         Can't open file
@@ -1675,9 +1706,21 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_DOWNLOAD_STARTED" desc="Message to show when download has started [CHAR LIMIT=30]">
         Downloading…
       </message>
-      <message name="IDS_DOWNLOAD_SUCCEEDED_MESSAGE" desc="Transient message shown when a file download has succeeded." meaning="Android">
+      <message name="IDS_DOWNLOAD_SUCCEEDED_MESSAGE" desc="App-based transient message shown when a file download has succeeded." meaning="Android">
+        <ph name="FILE_NAME">%1$s<ex>http://abc.com/test.pdf</ex></ph> downloaded in <ph name="PRODUCT_NAME">%2$s<ex>Chrome</ex></ph>
+      </message>
+      <message name="IDS_DOWNLOAD_SUCCEEDED_MESSAGE_DEFAULT" desc="Transient message shown when a file download has succeeded." meaning="Android">
         <ph name="FILE_NAME">%1$s<ex>http://abc.com/test.pdf</ex></ph> downloaded
       </message>
+      <message name="IDS_FILE_SIZE_DOWNLOADED_KB" desc="Notification message showing how many KBs have been downloaded.">
+        Downloaded <ph name="KBS">%1$.1f<ex>10.1</ex></ph> KB
+      </message>
+      <message name="IDS_FILE_SIZE_DOWNLOADED_MB" desc="Notification message showing how many MBs have been downloaded.">
+        Downloaded <ph name="MBS">%1$.1f<ex>10.1</ex></ph> MB
+      </message>
+      <message name="IDS_FILE_SIZE_DOWNLOADED_GB" desc="Notification message showing how many GBs have been downloaded.">
+        Downloaded <ph name="GBS">%1$.1f<ex>10.1</ex></ph> GB
+      </message>
       <message name="IDS_REMAINING_DURATION_DAYS" desc="Message to show remaining duration in multiple days">
         <ph name="DAYS">%1$d<ex>2</ex></ph> days left
       </message>
@@ -1790,7 +1833,18 @@ To obtain new licenses, connect to the internet and play your downloaded content
         No downloads here
       </message>
       <message name="IDS_DOWNLOAD_MANAGER_OPEN_WITH" desc="Menu item to open an item with another app.">
-        Open with...
+        Open with…
+      </message>
+
+      <!-- Browsing History UI -->
+      <message name="IDS_HISTORY_MANAGER_EMPTY" desc="Indicates that there are no browsing history items.">
+        No history here
+      </message>
+      <message name="IDS_HISTORY_MANAGER_NO_RESULTS" desc="Text explaining that no browsing history items match a search query.">
+        No history found
+      </message>
+      <message name="IDS_HISTORY_MANAGER_SEARCH" desc="Placeholder text for the input field that allows users to search browsing history.">
+        Search your history
       </message>
 
       <!-- Document mode messages -->
@@ -1893,21 +1947,27 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_CAST_ERROR_PLAYING_VIDEO" desc="The message shown to the user when playing a video to the Chromecast fails.">
         Cannot play video on <ph name="SCREEN_NAME">%1$s<ex>Living Room TV</ex></ph>.
       </message>
-      <message name="IDS_ACCESSIBILITY_PLAY" desc="Content description for the play button that starts playing the media.">
+      <message name="IDS_ACCESSIBILITY_PLAY" desc="The play button that starts playing the media.">
         Play
       </message>
-      <message name="IDS_ACCESSIBILITY_PAUSE" desc="Content description for the pause button that pauses playing the media.">
+      <message name="IDS_ACCESSIBILITY_PAUSE" desc="The pause button that pauses playing the media.">
         Pause
       </message>
-      <message name="IDS_ACCESSIBILITY_STOP" desc="Content description for the stop button that stops playing the media.">
+      <message name="IDS_ACCESSIBILITY_STOP" desc="The stop button that stops playing the media.">
         Stop
       </message>
-      <message name="IDS_ACCESSIBILITY_PREVIOUS_TRACK" desc="Content description for the previous track button that switches media to the previous track.">
+      <message name="IDS_ACCESSIBILITY_PREVIOUS_TRACK" desc="The previous track button that switches media to the previous track.">
         Previous track
       </message>
-      <message name="IDS_ACCESSIBILITY_NEXT_TRACK" desc="Content description for the next track button that switches media to the next track.">
+      <message name="IDS_ACCESSIBILITY_NEXT_TRACK" desc="The next track button that switches media to the next track.">
         Next track
       </message>
+      <message name="IDS_ACCESSIBILITY_SEEK_FORWARD" desc="The seek forward button that seeks media to a later position.">
+        Seek forward
+      </message>
+      <message name="IDS_ACCESSIBILITY_SEEK_BACKWARD" desc="The seek backward button that seeks media to an earlier position.">
+        Seek backward
+      </message>
 
       <!-- New Tab Page strings -->
       <message name="IDS_NTP_BOOKMARKS" desc="Text for bookmarks button [CHAR-LIMIT=20]">
@@ -1961,9 +2021,6 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_RECENT_TABS_HIDE_MENU_OPTION" desc="Context menu option to remove a foreign session.">
         Hide for now
       </message>
-      <message name="IDS_RECENT_TABS_THIS_DEVICE" desc="Header shown above the list of tabs currently open on this device.">
-        This device
-      </message>
       <message name="IDS_RECENT_TABS_SHOW_MORE" desc="Text shown on the button that shows all the currently open tabs in recent tabs page.">
         More
       </message>
@@ -2069,7 +2126,10 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_BOOKMARKS_FOLDER_EMPTY" desc="Text explaining that the currently selected bookmarks folder is empty.">
         No bookmarks here
       </message>
-      <message name="IDS_BOOKMARK_PAGE_SAVED" desc="Message shown after user adds a new bookmark. [CHAR-LIMIT=32]">
+      <message name="IDS_BOOKMARK_PAGE_SAVED" desc="App-based message shown after user adds a new bookmark. [CHAR-LIMIT=32]">
+        Bookmarked in <ph name="PRODUCT_NAME">%1$s<ex>Chrome</ex></ph>
+      </message>
+      <message name="IDS_BOOKMARK_PAGE_SAVED_DEFAULT" desc="Default message shown after user adds a new bookmark. [CHAR-LIMIT=32]">
         Bookmarked
       </message>
       <message name="IDS_BOOKMARK_PAGE_SAVED_FOLDER" desc="Message shown after user adds a new bookmark. Also specifies in which folder the bookmark was added. [CHAR-LIMIT=32]">
@@ -2537,9 +2597,6 @@ You can control the Physical Web in Chrome Settings.
       <message name="IDS_PHYSICAL_WEB_LAUNCH_BUTTON" desc="The label for a button that opens a list of nearby URLs">
         See what's nearby
       </message>
-      <message name="IDS_PHYSICAL_WEB_BOTTOM_BAR" desc="A message displayed in the nearby URLs list activity informing the user that a notification will appear whenever devices broadcasting URLs are nearby">
-        Future nearby Physical Web pages will show up in your notifications list
-      </message>
 
       <!-- WebUsb Picker UI strings -->
       <message name="IDS_USB_CHOOSER_DIALOG_PROMPT" desc="The text that is used to introduce the USB chooser dialog to the user.">
@@ -2598,10 +2655,10 @@ You can control the Physical Web in Chrome Settings.
       <message name="IDS_PAYMENTS_ADD_VALID_CARD_NUMBER" desc="The title of the dialog for user to add valid payment card number.">
         Add valid card number
       </message>
-      <message name="IDS_PAYMENTS_MORE_INFORMATION_REQUIRED" desc="The label to indicate more information is required for payment card.">
+      <message name="IDS_PAYMENTS_MORE_INFORMATION_REQUIRED" desc="The label to indicate more information is required for payment card or shipping address or contact info.">
         More information required
       </message>
-      <message name="IDS_PAYMENTS_ADD_MORE_INFORMATION" desc="The title of the dialog for user to add more information to payment card.">
+      <message name="IDS_PAYMENTS_ADD_MORE_INFORMATION" desc="The title of the dialog for user to add more information to payment card or shipping address or contact info.">
         Add more information
       </message>
       <message name="IDS_PAYMENTS_EDIT_CARD" desc="The title of the dialog for user to edit payment card.">
@@ -2610,10 +2667,10 @@ You can control the Physical Web in Chrome Settings.
       <message name="IDS_PAYMENTS_CREDIT_CARD_EXPIRATION_DATE_ABBR" desc="Abbreviated label for credit card expiration date. [CHAR-LIMIT=32]">
         Exp: <ph name="EXPIRATION_MONTH">%1$s<ex>06</ex></ph>/<ph name="EXPIRATION_YEAR">%2$s<ex>17</ex></ph>
       </message>
-      <message name="IDS_PAYMENTS_PHONE_NUMBER_REQUIRED" desc="The label to indicate phone number is required in the shipping address. This phone number can be used, for example, if there's a problem with shipping a package to its destination.">
+      <message name="IDS_PAYMENTS_PHONE_NUMBER_REQUIRED" desc="The label to indicate phone number is required in the shipping address or contact info. This phone number can be used, for example, if there's a problem with shipping a package to its destination.">
         Phone number required
       </message>
-      <message name="IDS_PAYMENTS_ADD_PHONE_NUMBER" desc="The title of the dialog for user to add phone number to the shipping address. This phone number can be used, for example, if there's a problem with shipping a package to its destination.">
+      <message name="IDS_PAYMENTS_ADD_PHONE_NUMBER" desc="The title of the dialog for user to add phone number to the shipping address or contact info. This phone number can be used, for example, if there's a problem with shipping a package to its destination.">
         Add phone number
       </message>
       <message name="IDS_PAYMENTS_RECIPIENT_REQUIRED" desc="The label to indicate recipient is required in the shipping address. The recipient could be a person or institute name identifies the receiver of the shipping package.">
@@ -2628,6 +2685,18 @@ You can control the Physical Web in Chrome Settings.
       <message name="IDS_PAYMENTS_ADD_VALID_ADDRESS" desc="The title of the dialog for user to add valid shipping address. For example, missing state or city name.">
         Add valid address
       </message>
+      <message name="IDS_PAYMENTS_EMAIL_REQUIRED" desc="The label to indicate email is required for the contact details. This email can be used to contact the payer.">
+        Email required
+      </message>
+      <message name="IDS_PAYMENTS_ADD_EMAIL" desc="The title of the dialog for user to add email to the contact details. This email can be used to contact the payer.">
+        Add email
+      </message>
+      <message name="IDS_PAYMENTS_NAME_REQUIRED" desc="The label to indicate name is required for the contact details. This name could be a person or institute name of the payer.">
+        Name required
+      </message>
+      <message name="IDS_PAYMENTS_ADD_NAME" desc="The title of the dialog for user to add name to the contact details. This name could be a person or institute name of the payer.">
+        Add name
+      </message>
       <message name="IDS_PAYMENTS_ORDER_SUMMARY_LABEL" desc="The title of the section that shows the summary of the order, including names and prices of individual line items, i.e. the bill.">
         Order summary
       </message>
@@ -2670,6 +2739,15 @@ You can control the Physical Web in Chrome Settings.
       <message name="IDS_PAYMENTS_UPDATED_LABEL" desc="The text that informs the user that the total value of their cart has been updated.">
         Updated
       </message>
+      <message name="IDS_PAYMENTS_CARD_AND_ADDRESS_SETTINGS" desc="Label of the section containing the link to go to the settings page for card and address options.">
+        You can manage cards and addresses in <ph name="BEGIN_LINK">&lt;link&gt;</ph>Settings<ph name="END_LINK">&lt;/link&gt;</ph>.
+      </message>
+      <message name="IDS_PAYMENTS_CARD_AND_ADDRESS_SETTINGS_SIGNED_IN" desc="Label of the section containing the origin description and the link to go to the settings page for card and address options. This label is used when the user is signed in.">
+        Card and address options are from your Google Account (<ph name="ACCOUNT_EMAIL">%1$s<ex>johndoe@gmail.com</ex></ph>) and Chrome. You can manage these in <ph name="BEGIN_LINK">&lt;link&gt;</ph>Settings<ph name="END_LINK">&lt;/link&gt;</ph>.
+      </message>
+      <message name="IDS_PAYMENTS_CARD_AND_ADDRESS_SETTINGS_SIGNED_OUT" desc="Label of the section containing the origin description and the link to go to the settings page for card and address options. This label is used when the user is not signed in.">
+        Card and address options are from Chrome. You can manage these in <ph name="BEGIN_LINK">&lt;link&gt;</ph>Settings<ph name="END_LINK">&lt;/link&gt;</ph>.
+      </message>
 
       <!-- Shipping address in web payments API -->
       <message name="IDS_PAYMENTS_SHIPPING_SUMMARY_LABEL" desc="The title for the section of shipping information. Shipping is typically used for packages.">
@@ -2721,6 +2799,9 @@ You can control the Physical Web in Chrome Settings.
       <message name="IDS_PAYMENTS_UNSUPPORTED_PICKUP_ADDRESS" desc="Text implying that a user needs to choose a different pickup address, because the currently selected address is not supported. This address can be used, for example, for laundry pickup.">
         Unsupported pickup address. Select a different address.
       </message>
+      <message name="IDS_PAYMENTS_ANDROID_APP_ERROR" desc="Error message that is shown when an Android payment application fails to start.">
+        Unable to launch payment app.
+      </message>
 
       <!-- Migration strings -->
       <message name="IDS_TAB_SWITCHER_CALLOUT_HEADER" desc="Header for the Tab Switcher callout.">
@@ -2768,6 +2849,74 @@ You can control the Physical Web in Chrome Settings.
       <message name="IDS_WEBAPK_UNKNOWN_SOURCES_SETTINGS_BUTTON" desc="Button label for opening Android Settings from dialog warning user that installation from Unknown sources is required for WebAPK experiment.">
         Settings
       </message>
+
+      <!-- Keyboard shortcuts in Android N-->
+      <message name="IDS_KEYBOARD_SHORTCUT_OPEN_NEW_TAB" desc="A text label that appears next to the keyboard shortcut to open a new tab in Chrome. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Open a new tab
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_REOPEN_NEW_TAB" desc="A text label that appears next to the keyboard shortcut for reopening the last tab in the chrome app. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Reopen the last closed tab
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_NEW_INCOGNITO_TAB" desc="A text label that appears next to a keyboard shortcut to open a new tab in incognito mode in Chrome. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Open a new tab in Incognito mode
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_OPEN_MENU" desc="A text label that appears next to a keyboard shortcut that opens the overflow menu in Chrome. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Open the menu
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_NEXT_TAB" desc="A text label that appears next to the keyboard shortcut that will move the user to the next tab in the Chrome app. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Jump to the next tab
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_PREV_TAB" desc="A text label that appears next to the keyboard shortcut that will move the user to the previous tab in the Chrome app. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Jump to the previous tab
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_CLOSE_TAB" desc="A text label that appears next to the keyboard shortcut that will close the current tab in Chrome. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Close current tab
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_FIND_BAR" desc="A text label that appears next to the keyboard shortcut that will open the find bar that searches what is on the screen. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Open the Find Bar
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_ADDRESS_BAR" desc="A text label that appears next to the keyboard that will let you focus on the address bar on the screen. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Jump to the address bar
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_BOOKMARK_MANAGER" desc="A text label that appears next to the keyboard shortcut that will open the bookmarks manager in Chrome. On a tablet this is a new tab, on the phone this is a new activity. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Open the bookmarks manager
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_BOOKMARK_PAGE" desc="A text label that appears next to the keyboard shortcut that will bookmark the page that is currently on screen. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Bookmark the current page
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_HISTORY_MANAGER" desc="A text label that appears next to the keyboard shorcut that will open up the history page. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Open the history page
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_PRINT_PAGE" desc="A text label that appears next to the keyboard shortcut that will open the print page. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Open options to print page
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_ZOOM_IN" desc="A text label that appears next to the keyboard shortcut that will increase everything on the page. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Make everything on the page bigger
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_ZOOM_OUT" desc="A text label that appears next to the keyboard shortcut that will decrease everything on the page. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Make everything on the page smaller
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_RESET_ZOOM" desc="A text label that appears next to the keyboard shortcut that will reset the zoom back to the original size. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Return everything on the page to default size
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_RELOAD_PAGE" desc="A text label that appears next to the keyboard shortcut that will reload the current page. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Reload the current page
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_RELOAD_NO_CACHE" desc="A text label that appears next to the keyboard shortcut that will reload the current page without a cache. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Reload the current page, ignoring cached content
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_HELP_CENTER" desc="A text label that appears next to the keyboard shortcut that will open the Google Chrome Help Center in a new tab. The shortcut description is shown in a system dialog along with all other supported shortcuts. [CHAR-LIMIT=55]">
+        Open the Chrome Help Center in a new tab
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_TAB_GROUP_HEADER" desc="A text label that appears above a list of shortcuts that are related to the tab window. This group is part of several groups of keyboard shortcuts all shown in a dialog.">
+        Tab and window shortcuts
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_CHROME_FEATURE_GROUP_HEADER" desc="A text label that appears above a list of shortcuts that are related to the Chrome app features. This group is part of several groups of keyboard shortcuts all shown in a dialog.">
+        Google Chrome feature shortcuts
+      </message>
+      <message name="IDS_KEYBOARD_SHORTCUT_WEBPAGE_GROUP_HEADER" desc="A text label that appears above a list of shortcuts that are related to manipulation of the current tab window. This group is part of several groups of keyboard shortcuts all shown in a dialog.">
+        Webpage shortcuts
+      </message>
     </messages>
   </release>
 </grit>
diff --git a/chromium/chrome/android/java_sources.gni b/chromium/chrome/android/java_sources.gni
index 3d4b12d2f23..35d8bb2cfb9 100644
--- a/chromium/chrome/android/java_sources.gni
+++ b/chromium/chrome/android/java_sources.gni
@@ -32,7 +32,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ChromeWindow.java",
   "java/src/org/chromium/chrome/browser/DeferredStartupHandler.java",
   "java/src/org/chromium/chrome/browser/DevToolsServer.java",
-  "java/src/org/chromium/chrome/browser/EmbedContentViewActivity.java",
   "java/src/org/chromium/chrome/browser/FileProviderHelper.java",
   "java/src/org/chromium/chrome/browser/FrozenNativePage.java",
   "java/src/org/chromium/chrome/browser/InsetObserverView.java",
@@ -42,6 +41,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/JavaExceptionReporter.java",
   "java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java",
   "java/src/org/chromium/chrome/browser/KeyboardShortcuts.java",
+  "java/src/org/chromium/chrome/browser/DelayedScreenLockIntentHandler.java",
   "java/src/org/chromium/chrome/browser/LauncherShortcutActivity.java",
   "java/src/org/chromium/chrome/browser/LoginPrompt.java",
   "java/src/org/chromium/chrome/browser/LollipopTtsPlatformImpl.java",
@@ -50,6 +50,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/PasswordUIView.java",
   "java/src/org/chromium/chrome/browser/PowerBroadcastReceiver.java",
   "java/src/org/chromium/chrome/browser/RepostFormWarningDialog.java",
+  "java/src/org/chromium/chrome/browser/SearchGeolocationDisclosureTabHelper.java",
   "java/src/org/chromium/chrome/browser/ServiceTabLauncher.java",
   "java/src/org/chromium/chrome/browser/SnackbarActivity.java",
   "java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java",
@@ -87,9 +88,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/banners/AppDetailsDelegate.java",
   "java/src/org/chromium/chrome/browser/banners/InstallerDelegate.java",
   "java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java",
-  "java/src/org/chromium/chrome/browser/blimp/BlimpClientContextFactory.java",
-  "java/src/org/chromium/chrome/browser/blimp/ChromeBlimpClientContextDelegate.java",
-  "java/src/org/chromium/chrome/browser/blimp/ui/BlimpMessageBuilder.java",
   "java/src/org/chromium/chrome/browser/browsing_data/UrlFilter.java",
   "java/src/org/chromium/chrome/browser/browsing_data/UrlFilterBridge.java",
   "java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java",
@@ -130,7 +128,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/childaccounts/ExternalFeedbackReporter.java",
   "java/src/org/chromium/chrome/browser/compositor/CompositorView.java",
   "java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java",
-  "java/src/org/chromium/chrome/browser/compositor/CompositorViewHolderBehavior.java",
   "java/src/org/chromium/chrome/browser/compositor/Invalidator.java",
   "java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java",
   "java/src/org/chromium/chrome/browser/compositor/TitleCache.java",
@@ -236,6 +233,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchNetworkCommunicator.java",
   "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchObserver.java",
   "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchPolicy.java",
+  "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRankerLogger.java",
+  "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRankerLoggerImpl.java",
   "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchRequest.java",
   "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionController.java",
   "java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionHandler.java",
@@ -320,6 +319,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/DownloadResumptionScheduler.java",
   "java/src/org/chromium/chrome/browser/download/DownloadServiceDelegate.java",
   "java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceEntry.java",
+  "java/src/org/chromium/chrome/browser/download/DownloadSharedPreferenceHelper.java",
   "java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java",
   "java/src/org/chromium/chrome/browser/download/DownloadUmaStatsEntry.java",
   "java/src/org/chromium/chrome/browser/download/DownloadUtils.java",
@@ -341,6 +341,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/download/ui/SpaceDisplay.java",
   "java/src/org/chromium/chrome/browser/download/ui/ThumbnailProvider.java",
   "java/src/org/chromium/chrome/browser/download/ui/ThumbnailProviderImpl.java",
+  "java/src/org/chromium/chrome/browser/engagement/SiteEngagementService.java",
   "java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java",
   "java/src/org/chromium/chrome/browser/externalauth/UserRecoverableErrorHandler.java",
   "java/src/org/chromium/chrome/browser/externalauth/VerifiedHandler.java",
@@ -396,6 +397,16 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/gsa/GSAServiceClient.java",
   "java/src/org/chromium/chrome/browser/gsa/GSAState.java",
   "java/src/org/chromium/chrome/browser/help/HelpAndFeedback.java",
+  "java/src/org/chromium/chrome/browser/history/BrowsingHistoryBridge.java",
+  "java/src/org/chromium/chrome/browser/history/HistoryActivity.java",
+  "java/src/org/chromium/chrome/browser/history/HistoryAdapter.java",
+  "java/src/org/chromium/chrome/browser/history/HistoryPage.java",
+  "java/src/org/chromium/chrome/browser/history/HistoryItem.java",
+  "java/src/org/chromium/chrome/browser/history/HistoryItemView.java",
+  "java/src/org/chromium/chrome/browser/history/HistoryManager.java",
+  "java/src/org/chromium/chrome/browser/history/HistoryManagerToolbar.java",
+  "java/src/org/chromium/chrome/browser/history/HistoryManagerUtils.java",
+  "java/src/org/chromium/chrome/browser/history/HistoryProvider.java",
   "java/src/org/chromium/chrome/browser/historyreport/DeltaFileEntry.java",
   "java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java",
   "java/src/org/chromium/chrome/browser/historyreport/SearchJniBridge.java",
@@ -518,6 +529,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java",
   "java/src/org/chromium/chrome/browser/metrics/UmaUtils.java",
   "java/src/org/chromium/chrome/browser/metrics/VariationsSession.java",
+  "java/src/org/chromium/chrome/browser/metrics/WebApkUma.java",
   "java/src/org/chromium/chrome/browser/metrics/WebappUma.java",
   "java/src/org/chromium/chrome/browser/mojo/ChromeInterfaceRegistrar.java",
   "java/src/org/chromium/chrome/browser/multiwindow/MultiInstanceChromeTabbedActivity.java",
@@ -529,7 +541,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/nfc/BeamProvider.java",
   "java/src/org/chromium/chrome/browser/notifications/ActionInfo.java",
   "java/src/org/chromium/chrome/browser/notifications/CustomNotificationBuilder.java",
-  "java/src/org/chromium/chrome/browser/notifications/GoogleServicesNotificationController.java",
   "java/src/org/chromium/chrome/browser/notifications/NotificationBuilderBase.java",
   "java/src/org/chromium/chrome/browser/notifications/NotificationConstants.java",
   "java/src/org/chromium/chrome/browser/notifications/NotificationManagerProxy.java",
@@ -539,9 +550,10 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/notifications/NotificationSystemStatusUtil.java",
   "java/src/org/chromium/chrome/browser/notifications/StandardNotificationBuilder.java",
   "java/src/org/chromium/chrome/browser/notifications/WebApkNotificationClient.java",
+  "java/src/org/chromium/chrome/browser/ntp/ContentSuggestionsNotificationHelper.java",
   "java/src/org/chromium/chrome/browser/ntp/ContextMenuManager.java",
-  "java/src/org/chromium/chrome/browser/ntp/CurrentlyOpenTab.java",
   "java/src/org/chromium/chrome/browser/ntp/DisplayStyleObserver.java",
+  "java/src/org/chromium/chrome/browser/ntp/FakeRecentlyClosedTabManager.java",
   "java/src/org/chromium/chrome/browser/ntp/ForeignSessionHelper.java",
   "java/src/org/chromium/chrome/browser/ntp/IncognitoNewTabPage.java",
   "java/src/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java",
@@ -556,7 +568,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ntp/NativePageRootFrameLayout.java",
   "java/src/org/chromium/chrome/browser/ntp/NewTabPage.java",
   "java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java",
-  "java/src/org/chromium/chrome/browser/ntp/NewTabPagePrefs.java",
   "java/src/org/chromium/chrome/browser/ntp/NewTabPageScrollView.java",
   "java/src/org/chromium/chrome/browser/ntp/NewTabPageToolbar.java",
   "java/src/org/chromium/chrome/browser/ntp/NewTabPageUma.java",
@@ -565,8 +576,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ntp/RecentTabsGroupView.java",
   "java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java",
   "java/src/org/chromium/chrome/browser/ntp/RecentTabsPage.java",
+  "java/src/org/chromium/chrome/browser/ntp/RecentTabsPagePrefs.java",
   "java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java",
   "java/src/org/chromium/chrome/browser/ntp/RecentlyClosedBridge.java",
+  "java/src/org/chromium/chrome/browser/ntp/RecentlyClosedTab.java",
+  "java/src/org/chromium/chrome/browser/ntp/RecentlyClosedTabManager.java",
   "java/src/org/chromium/chrome/browser/ntp/TitleUtil.java",
   "java/src/org/chromium/chrome/browser/ntp/UiConfig.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/AboveTheFoldItem.java",
@@ -590,6 +604,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/ntp/cards/ProgressIndicatorView.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/ProgressItem.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/ProgressViewHolder.java",
+  "java/src/org/chromium/chrome/browser/ntp/cards/SectionList.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/SignInPromo.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/SpacingItem.java",
   "java/src/org/chromium/chrome/browser/ntp/cards/StatusCardViewHolder.java",
@@ -657,6 +672,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeader.java",
   "java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationSnackbarController.java",
   "java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java",
+  "java/src/org/chromium/chrome/browser/pageinfo/CertificateChainHelper.java",
   "java/src/org/chromium/chrome/browser/pageinfo/CertificateViewer.java",
   "java/src/org/chromium/chrome/browser/pageinfo/ConnectionInfoPopup.java",
   "java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java",
@@ -669,13 +685,15 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/password_manager/AutoSigninFirstRunDialog.java",
   "java/src/org/chromium/chrome/browser/password_manager/Credential.java",
   "java/src/org/chromium/chrome/browser/payments/AddressEditor.java",
+  "java/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFactory.java",
+  "java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java",
   "java/src/org/chromium/chrome/browser/payments/AutofillAddress.java",
   "java/src/org/chromium/chrome/browser/payments/AutofillContact.java",
   "java/src/org/chromium/chrome/browser/payments/AutofillPaymentApp.java",
   "java/src/org/chromium/chrome/browser/payments/AutofillPaymentInstrument.java",
   "java/src/org/chromium/chrome/browser/payments/CardEditor.java",
   "java/src/org/chromium/chrome/browser/payments/ContactEditor.java",
-  "java/src/org/chromium/chrome/browser/payments/CurrencyStringFormatter.java",
+  "java/src/org/chromium/chrome/browser/payments/CurrencyFormatter.java",
   "java/src/org/chromium/chrome/browser/payments/EditorBase.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentApp.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentAppFactory.java",
@@ -686,9 +704,14 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/payments/PaymentRequestMetrics.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentResponseHelper.java",
   "java/src/org/chromium/chrome/browser/payments/PaymentValidator.java",
+  "java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentApp.java",
+  "java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java",
+  "java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentInstrument.java",
   "java/src/org/chromium/chrome/browser/payments/ShippingStrings.java",
   "java/src/org/chromium/chrome/browser/payments/ui/BillingAddressAdapter.java",
   "java/src/org/chromium/chrome/browser/payments/ui/Completable.java",
+  "java/src/org/chromium/chrome/browser/payments/ui/ContactDetailsSection.java",
+  "java/src/org/chromium/chrome/browser/payments/ui/DropdownFieldAdapter.java",
   "java/src/org/chromium/chrome/browser/payments/ui/EditorDialogToolbar.java",
   "java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java",
   "java/src/org/chromium/chrome/browser/payments/ui/EditorFieldModel.java",
@@ -813,7 +836,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/preferences/website/ContentSettingException.java",
   "java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java",
   "java/src/org/chromium/chrome/browser/preferences/website/GeolocationInfo.java",
-  "java/src/org/chromium/chrome/browser/preferences/website/KeygenInfo.java",
   "java/src/org/chromium/chrome/browser/preferences/website/LocalStorageInfo.java",
   "java/src/org/chromium/chrome/browser/preferences/website/LocationCategory.java",
   "java/src/org/chromium/chrome/browser/preferences/website/ManageSpaceActivity.java",
@@ -852,8 +874,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/push_messaging/PushMessagingServiceObserver.java",
   "java/src/org/chromium/chrome/browser/rappor/RapporServiceBridge.java",
   "java/src/org/chromium/chrome/browser/rlz/RevenueStats.java",
-  "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingApiBridge.java",
-  "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingApiHandler.java",
   "java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java",
   "java/src/org/chromium/chrome/browser/services/AccountsChangedReceiver.java",
   "java/src/org/chromium/chrome/browser/services/AndroidEduAndChildAccountHelper.java",
@@ -863,6 +883,10 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/services/gcm/GcmUma.java",
   "java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java",
   "java/src/org/chromium/chrome/browser/sessions/SessionTabHelper.java",
+  "java/src/org/chromium/chrome/browser/shapedetection/BarcodeDetectionFactory.java",
+  "java/src/org/chromium/chrome/browser/shapedetection/BarcodeDetectionImpl.java",
+  "java/src/org/chromium/chrome/browser/shapedetection/TextDetectionFactory.java",
+  "java/src/org/chromium/chrome/browser/shapedetection/TextDetectionImpl.java",
   "java/src/org/chromium/chrome/browser/share/ShareDialogAdapter.java",
   "java/src/org/chromium/chrome/browser/share/ShareHelper.java",
   "java/src/org/chromium/chrome/browser/signin/AccountAdder.java",
@@ -895,6 +919,13 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/snackbar/smartlockautosignin/AutoSigninSnackbarController.java",
   "java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarController.java",
   "java/src/org/chromium/chrome/browser/ssl/SecurityStateModel.java",
+  "java/src/org/chromium/chrome/browser/suggestions/ContentSuggestionsActivity.java",
+  "java/src/org/chromium/chrome/browser/suggestions/SuggestionsNavigationDelegate.java",
+  "java/src/org/chromium/chrome/browser/suggestions/SuggestionsNavigationDelegateImpl.java",
+  "java/src/org/chromium/chrome/browser/suggestions/SuggestionsUiDelegate.java",
+  "java/src/org/chromium/chrome/browser/suggestions/SuggestionsUiDelegateImpl.java",
+  "java/src/org/chromium/chrome/browser/suggestions/SuggestionsMetricsReporter.java",
+  "java/src/org/chromium/chrome/browser/suggestions/SuggestionsRanker.java",
   "java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java",
   "java/src/org/chromium/chrome/browser/sync/GmsCoreSyncListener.java",
   "java/src/org/chromium/chrome/browser/sync/GoogleServiceAuthError.java",
@@ -917,8 +948,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/tab/SadTabView.java",
   "java/src/org/chromium/chrome/browser/tab/SadTabViewFactory.java",
   "java/src/org/chromium/chrome/browser/tab/Tab.java",
-  "java/src/org/chromium/chrome/browser/tab/TabBlimpContentsObserver.java",
-  "java/src/org/chromium/chrome/browser/tab/TabContentViewParent.java",
   "java/src/org/chromium/chrome/browser/tab/TabContextMenuItemDelegate.java",
   "java/src/org/chromium/chrome/browser/tab/TabContextMenuPopulator.java",
   "java/src/org/chromium/chrome/browser/tab/TabDelegateFactory.java",
@@ -994,6 +1023,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/upgrade/UpgradeActivity.java",
   "java/src/org/chromium/chrome/browser/upgrade/UpgradeIntentService.java",
   "java/src/org/chromium/chrome/browser/util/AccessibilityUtil.java",
+  "java/src/org/chromium/chrome/browser/util/ChromeContextUtil.java",
   "java/src/org/chromium/chrome/browser/util/ChromeFileProvider.java",
   "java/src/org/chromium/chrome/browser/util/ColorUtils.java",
   "java/src/org/chromium/chrome/browser/util/FeatureUtilities.java",
@@ -1005,6 +1035,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/util/UrlUtilities.java",
   "java/src/org/chromium/chrome/browser/util/ViewUtils.java",
   "java/src/org/chromium/chrome/browser/vr_shell/NonPresentingGvrContext.java",
+  "java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapper.java",
   "java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionChecker.java",
   "java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApi.java",
   "java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java",
@@ -1015,8 +1046,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHost.java",
   "java/src/org/chromium/chrome/browser/webapps/FullScreenActivity.java",
   "java/src/org/chromium/chrome/browser/webapps/FullScreenDelegateFactory.java",
-  "java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetector.java",
-  "java/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorFetcher.java",
+  "java/src/org/chromium/chrome/browser/webapps/GooglePlayWebApkInstallDelegate.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity0.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity1.java",
@@ -1028,11 +1058,11 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity7.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity8.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkActivity9.java",
+  "java/src/org/chromium/chrome/browser/webapps/WebApkBrowserControlsDelegate.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkInfo.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkInstaller.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkManagedActivity.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkMetaData.java",
-  "java/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtils.java",
+  "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateDataFetcher.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java",
   "java/src/org/chromium/chrome/browser/webapps/WebApkVersionManager.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity.java",
@@ -1047,6 +1077,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity8.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappActivity9.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappAuthenticator.java",
+  "java/src/org/chromium/chrome/browser/webapps/WebappBrowserControlsDelegate.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappControlContainer.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.java",
   "java/src/org/chromium/chrome/browser/webapps/WebappDelegateFactory.java",
@@ -1060,6 +1091,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
   "java/src/org/chromium/chrome/browser/widget/AlertDialogEditText.java",
   "java/src/org/chromium/chrome/browser/widget/AlwaysDismissedDialog.java",
+  "java/src/org/chromium/chrome/browser/widget/BottomSheet.java",
   "java/src/org/chromium/chrome/browser/widget/BoundedLinearLayout.java",
   "java/src/org/chromium/chrome/browser/widget/ClipDrawableProgressBar.java",
   "java/src/org/chromium/chrome/browser/widget/CompatibilityTextInputLayout.java",
@@ -1071,6 +1103,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/widget/FadingShadowView.java",
   "java/src/org/chromium/chrome/browser/widget/FloatLabelLayout.java",
   "java/src/org/chromium/chrome/browser/widget/LoadingView.java",
+  "java/src/org/chromium/chrome/browser/widget/MaterialProgressBar.java",
   "java/src/org/chromium/chrome/browser/widget/NumberRollView.java",
   "java/src/org/chromium/chrome/browser/widget/OverviewListLayout.java",
   "java/src/org/chromium/chrome/browser/widget/PaddedFrameLayout.java",
@@ -1079,8 +1112,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/widget/ProgressAnimationSmooth.java",
   "java/src/org/chromium/chrome/browser/widget/RadioButtonWithDescription.java",
   "java/src/org/chromium/chrome/browser/widget/RoundedIconGenerator.java",
-  "java/src/org/chromium/chrome/browser/widget/SlowedProgressBar.java",
-  "java/src/org/chromium/chrome/browser/widget/SmoothProgressBar.java",
   "java/src/org/chromium/chrome/browser/widget/TextBubble.java",
   "java/src/org/chromium/chrome/browser/widget/TintedDrawable.java",
   "java/src/org/chromium/chrome/browser/widget/TintedImageButton.java",
@@ -1107,6 +1138,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/widget/incognitotoggle/IncognitoToggleButtonTablet.java",
   "java/src/org/chromium/chrome/browser/widget/selection/SelectableItemHighlightView.java",
   "java/src/org/chromium/chrome/browser/widget/selection/SelectableItemView.java",
+  "java/src/org/chromium/chrome/browser/widget/selection/SelectableItemViewHolder.java",
   "java/src/org/chromium/chrome/browser/widget/selection/SelectionDelegate.java",
   "java/src/org/chromium/chrome/browser/widget/selection/SelectableListLayout.java",
   "java/src/org/chromium/chrome/browser/widget/selection/SelectionToolbar.java",
@@ -1115,6 +1147,7 @@ chrome_java_sources = [
 
 chrome_vr_java_sources = [
   "java/src/org/chromium/chrome/browser/vr_shell/NonPresentingGvrContextImpl.java",
+  "java/src/org/chromium/chrome/browser/vr_shell/VrClassesWrapperImpl.java",
   "java/src/org/chromium/chrome/browser/vr_shell/VrCoreVersionCheckerImpl.java",
   "java/src/org/chromium/chrome/browser/vr_shell/VrDaydreamApiImpl.java",
   "java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java",
@@ -1164,6 +1197,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/TabsTest.java",
   "javatests/src/org/chromium/chrome/browser/UrlSchemeTest.java",
   "javatests/src/org/chromium/chrome/browser/UsbChooserDialogTest.java",
+  "javatests/src/org/chromium/chrome/browser/VideoFullscreenOrientationLockChromeTest.java",
   "javatests/src/org/chromium/chrome/browser/WarmupManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/WebShareTest.java",
   "javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java",
@@ -1176,7 +1210,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/banners/AppBannerManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/banners/InstallerDelegateTest.java",
-  "javatests/src/org/chromium/chrome/browser/blimp/BlimpMessageBuilderTest.java",
   "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkBridgeTest.java",
   "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkModelTest.java",
   "javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java",
@@ -1208,6 +1241,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabFromChromeExternalNavigationTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsTestUtils.java",
+  "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistenceIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java",
   "javatests/src/org/chromium/chrome/browser/customtabs/RequestThrottlerTest.java",
   "javatests/src/org/chromium/chrome/browser/document/LauncherActivityTest.java",
@@ -1220,11 +1254,13 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/download/DownloadNotificationServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/download/DownloadTest.java",
   "javatests/src/org/chromium/chrome/browser/download/DownloadTestBase.java",
+  "javatests/src/org/chromium/chrome/browser/download/DownloadUtilsTest.java",
   "javatests/src/org/chromium/chrome/browser/download/MockDownloadNotificationService.java",
   "javatests/src/org/chromium/chrome/browser/download/OMADownloadHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/download/SystemDownloadNotifierTest.java",
   "javatests/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapterTest.java",
   "javatests/src/org/chromium/chrome/browser/download/ui/StubbedProvider.java",
+  "javatests/src/org/chromium/chrome/browser/engagement/SiteEngagementServiceTest.java",
   "javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImplTest.java",
   "javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/externalnav/IntentWithGesturesHandlerTest.java",
@@ -1240,11 +1276,13 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/gsa/GSAServiceClientTest.java",
   "javatests/src/org/chromium/chrome/browser/hardware_acceleration/ChromeTabbedActivityHWATest.java",
   "javatests/src/org/chromium/chrome/browser/hardware_acceleration/CustomTabActivityHWATest.java",
-  "javatests/src/org/chromium/chrome/browser/hardware_acceleration/EmbedContentViewActivityHWATest.java",
   "javatests/src/org/chromium/chrome/browser/hardware_acceleration/ManifestHWATest.java",
   "javatests/src/org/chromium/chrome/browser/hardware_acceleration/ToastHWATest.java",
   "javatests/src/org/chromium/chrome/browser/hardware_acceleration/Utils.java",
   "javatests/src/org/chromium/chrome/browser/hardware_acceleration/WebappActivityHWATest.java",
+  "javatests/src/org/chromium/chrome/browser/history/HistoryActivityTest.java",
+  "javatests/src/org/chromium/chrome/browser/history/HistoryAdapterTest.java",
+  "javatests/src/org/chromium/chrome/browser/history/StubbedHistoryProvider.java",
   "javatests/src/org/chromium/chrome/browser/identity/SettingsSecureBasedIdentificationGeneratorTest.java",
   "javatests/src/org/chromium/chrome/browser/identity/UniqueIdentificationGeneratorFactoryTest.java",
   "javatests/src/org/chromium/chrome/browser/identity/UuidBasedUniqueIdentificationGeneratorTest.java",
@@ -1253,6 +1291,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/infobar/InfoBarControlLayoutTest.java",
   "javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java",
   "javatests/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfobarTest.java",
+  "javatests/src/org/chromium/chrome/browser/infobar/SearchGeolocationDisclosureInfoBarTest.java",
   "javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java",
   "javatests/src/org/chromium/chrome/browser/instantapps/InstantAppsHandlerTest.java",
   "javatests/src/org/chromium/chrome/browser/invalidation/ChromeBrowserSyncAdapterTest.java",
@@ -1268,6 +1307,8 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/media/router/MediaRouterIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/media/router/MockMediaRouteProvider.java",
   "javatests/src/org/chromium/chrome/browser/media/ui/AutoplayMutedNotificationTest.java",
+  "javatests/src/org/chromium/chrome/browser/media/ui/NotificationActionsUpdatedTest.java",
+  "javatests/src/org/chromium/chrome/browser/media/ui/NotificationTestUtils.java",
   "javatests/src/org/chromium/chrome/browser/media/ui/NotificationTitleUpdatedTest.java",
   "javatests/src/org/chromium/chrome/browser/media/ui/PauseOnHeadsetUnplugTest.java",
   "javatests/src/org/chromium/chrome/browser/multiwindow/MultiWindowIntegrationTest.java",
@@ -1282,6 +1323,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/ntp/FakeMostVisitedSites.java",
   "javatests/src/org/chromium/chrome/browser/ntp/NewTabPageNavigationTest.java",
   "javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java",
+  "javatests/src/org/chromium/chrome/browser/ntp/RecentTabsPageTest.java",
   "javatests/src/org/chromium/chrome/browser/ntp/cards/NewTabPageRecyclerViewTest.java",
   "javatests/src/org/chromium/chrome/browser/ntp/snippets/ArticleSnippetsTest.java",
   "javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java",
@@ -1312,29 +1354,36 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/physicalweb/UrlInfoTest.java",
   "javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/policy/CombinedPolicyProviderTest.java",
-  "javatests/src/org/chromium/chrome/browser/payments/CurrencyStringFormatterTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/CurrencyFormatterTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestAbortTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestBasicCardTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCanMakePaymentMetricsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCanMakePaymentQueryNoCardTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCanMakePaymentQueryTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestBillingAddressTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCardEditorAutoAdvanceTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCcCanMakePaymentQueryNoCardTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestCcCanMakePaymentQueryTest.java",
-  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsAndFreeShippingTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsSectionUnitTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingMultipleAddressesTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestDynamicShippingSingleAddressTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestEmailTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestEmailAndFreeShippingTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestEmailAndPhoneTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestExpiredLocalCardTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestExtraShippingOptionsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFailCompleteTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFieldTrialTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestFreeShippingTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompleteContactDetailsTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompleteContactDetailsAndFreeShippingTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompleteEmailTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompletePhoneTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestIncompleteServerCardTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestJourneyLoggerTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestJourneyLoggerUnitTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestMetricsUnitTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestMultipleContactDetailsTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestMetricsTest.java",
@@ -1348,6 +1397,8 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPhoneAndFreeShippingTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestRemoveBillingAddressTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestServerCardTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestServiceWorkerPaymentAppTest.java",
+  "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestShippingAddressTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestShowTwiceTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTabTest.java",
   "javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java",
@@ -1425,8 +1476,8 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogTest.java",
   "javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/webapps/TestFetchStorageCallback.java",
-  "javatests/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorFetcherTest.java",
-  "javatests/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorTest.java",
+  "javatests/src/org/chromium/chrome/browser/webapps/WebApkUpdateDataFetcherTest.java",
+  "javatests/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java",
   "javatests/src/org/chromium/chrome/browser/webapps/WebappAuthenticatorTest.java",
   "javatests/src/org/chromium/chrome/browser/webapps/WebappDirectoryManagerTest.java",
@@ -1453,6 +1504,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/ChromeBackupAgentTest.java",
   "junit/src/org/chromium/chrome/browser/ChromeBackgroundServiceWaiterTest.java",
   "junit/src/org/chromium/chrome/browser/EnableFeatures.java",
+  "junit/src/org/chromium/chrome/browser/DelayedScreenLockIntentHandlerTest.java",
   "junit/src/org/chromium/chrome/browser/ShortcutHelperTest.java",
   "junit/src/org/chromium/chrome/browser/SSLClientCertificateRequestTest.java",
   "junit/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperTest.java",
@@ -1476,13 +1528,17 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/media/router/cast/JSONTestUtils.java",
   "junit/src/org/chromium/chrome/browser/media/router/cast/MediaSourceTest.java",
   "junit/src/org/chromium/chrome/browser/media/router/cast/TestUtils.java",
+  "junit/src/org/chromium/chrome/browser/media/ui/MediaImageManagerTest.java",
+  "junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationButtonComputationTest.java",
   "junit/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeUnitTest.java",
   "junit/src/org/chromium/chrome/browser/ntp/NativePageFactoryTest.java",
   "junit/src/org/chromium/chrome/browser/ntp/TitleUtilTest.java",
   "junit/src/org/chromium/chrome/browser/ntp/cards/ContentSuggestionsTestUtils.java",
+  "junit/src/org/chromium/chrome/browser/ntp/cards/FakeOfflinePageBridge.java",
   "junit/src/org/chromium/chrome/browser/ntp/cards/InnerNodeTest.java",
   "junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java",
   "junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java",
+  "junit/src/org/chromium/chrome/browser/ntp/cards/SectionListTest.java",
   "junit/src/org/chromium/chrome/browser/offlinepages/BackgroundSchedulerTest.java",
   "junit/src/org/chromium/chrome/browser/offlinepages/BackgroundOfflinerTaskTest.java",
   "junit/src/org/chromium/chrome/browser/offlinepages/ClientIdTest.java",
@@ -1491,21 +1547,20 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageTestRunner.java",
   "junit/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsUnitTest.java",
   "junit/src/org/chromium/chrome/browser/offlinepages/ShadowGcmNetworkManager.java",
+  "junit/src/org/chromium/chrome/browser/offlinepages/ShadowGoogleApiAvailability.java",
   "junit/src/org/chromium/chrome/browser/offlinepages/StubBackgroundSchedulerProcessor.java",
   "junit/src/org/chromium/chrome/browser/offlinepages/TaskExtrasPackerTest.java",
   "junit/src/org/chromium/chrome/browser/offlinepages/downloads/OfflinePageDownloadBridgeTest.java",
   "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java",
   "junit/src/org/chromium/chrome/browser/omaha/VersionNumberTest.java",
   "junit/src/org/chromium/chrome/browser/payments/AutofillContactTest.java",
-  "junit/src/org/chromium/chrome/browser/payments/CurrencyStringFormatterUnitTest.java",
+  "junit/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.java",
   "junit/src/org/chromium/chrome/browser/snackbar/SnackbarCollectionUnitTest.java",
   "junit/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderUnitTest.java",
   "junit/src/org/chromium/chrome/browser/tabstate/TabStateUnitTest.java",
-  "junit/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappDataStorageTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.java",
-  "junit/src/org/chromium/chrome/browser/webapps/WebApkMetaDataUtilsTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebApkUpdateManagerTest.java",
 ]
 
diff --git a/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn b/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn
index 77fa40f148b..91dc8d74325 100644
--- a/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn
+++ b/chromium/chrome/android/webapk/libs/runtime_library/BUILD.gn
@@ -67,5 +67,6 @@ android_library("runtime_library_javatests") {
     "//base:base_java_test_support",
     "//chrome/test/android:chrome_java_test_support",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_support_test_runner:runner_java",
   ]
 }
diff --git a/chromium/chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service/BUILD.gn b/chromium/chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service/BUILD.gn
index 93d67178186..e16e1f6791f 100644
--- a/chromium/chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service/BUILD.gn
+++ b/chromium/chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service/BUILD.gn
@@ -6,6 +6,8 @@ import("//build/config/android/rules.gni")
 
 # Implements service which uses {@link WebApkServiceImpl} for testing.
 android_apk("apk_with_webapk_service") {
+  # Used as an additional_apk in test scripts.
+  never_incremental = true
   android_manifest = "AndroidManifest.xml"
   apk_name = "ApkWithWebApkService"
   java_files = [ "src/org/chromium/webapk/lib/runtime_library/test/TestWebApkServiceImplWrapper.java" ]
diff --git a/chromium/chrome/android/webapk/shell_apk/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/BUILD.gn
index fb6fabed503..c400c2d7c4d 100644
--- a/chromium/chrome/android/webapk/shell_apk/BUILD.gn
+++ b/chromium/chrome/android/webapk/shell_apk/BUILD.gn
@@ -16,6 +16,11 @@ declare_args() {
   # The Url of the Web Manifest file.
   webapk_web_manifest_url = "https://www.template.com/manifest.json"
 
+  # Murmur2 hash of the homescreen icon. The hash should be of the icon as it is
+  # available from the web. The icon bytes should not be transformed (e.g.
+  # decoded / encoded) prior to taking the hash.
+  webapk_icon_murmur2_hash = "0"
+
   # Attributes from Web Manifest.
   webapk_start_url = "https://www.template.com/home_page"
   webapk_name = "Longer Sample WebAPK Name"
@@ -25,14 +30,7 @@ declare_args() {
   webapk_orientation = "portrait"
   webapk_theme_color = "2147483648L"  # HostBrowserLauncher#MANIFEST_COLOR_INVALID_OR_MISSING
   webapk_background_color = "2147483648L"  #HostBrowserLauncher#MANIFEST_COLOR_INVALID_OR_MISSING
-
-  # The URL of the app icon. Empty if the app icon is generated.
-  webapk_icon_url = "http://www.template.com/icon.png"
-
-  # Murmur2 hash of the homescreen icon. The hash should be of the icon as it is
-  # available from the web. The icon bytes should not be transformed (e.g.
-  # decoded / encoded) prior to taking the hash.
-  webapk_icon_murmur2_hash = "0L"
+  webapk_icon_urls_and_icon_murmur2_hashes = "http://www.template.com/icon1.png $webapk_icon_murmur2_hash http://www.template.com/icon2.png $webapk_icon_murmur2_hash"
 
   # Host part of |webapk_scope_url|.
   webapk_scope_url_host = "www.template.com"
@@ -68,8 +66,7 @@ jinja_template("shell_apk_manifest") {
     "orientation=$webapk_orientation",
     "theme_color=$webapk_theme_color",
     "background_color=$webapk_background_color",
-    "icon_url=$webapk_icon_url",
-    "icon_murmur2_hash=$webapk_icon_murmur2_hash",
+    "icon_urls_and_icon_murmur2_hashes=$webapk_icon_urls_and_icon_murmur2_hashes",
     "scope_url_host=$webapk_scope_url_host",
     "scope_url_path=$webapk_scope_url_path",
     "web_manifest_url=$webapk_web_manifest_url",
@@ -132,6 +129,7 @@ android_library("shell_apk_javatests") {
     "//base:base_java_test_support",
     "//chrome/android/webapk/libs/common:common_java",
     "//content/public/test/android:content_java_test_support",
+    "//third_party/android_support_test_runner:runner_java",
   ]
   srcjar_deps = [ "javatests/dex_optimizer:dex_optimizer_service_aidl" ]
 }
diff --git a/chromium/chrome/android/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn b/chromium/chrome/android/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn
index 8a7b64232f3..0c867c7ed57 100644
--- a/chromium/chrome/android/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn
+++ b/chromium/chrome/android/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn
@@ -13,6 +13,8 @@ android_aidl("dex_optimizer_service_aidl") {
 }
 
 android_apk("dex_optimizer_apk") {
+  # Used as an additional_apk in test scripts.
+  never_incremental = true
   android_manifest = "AndroidManifest.xml"
   apk_name = "DexOptimizer"
   chromium_code = false