BASELINE: Update Chromium to 78.0.3904.130

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

2 files changed, 69 insertions, 69 deletions

diff --git a/chromium/chrome/browser/resources/welcome/google_apps/nux_google_apps.html b/chromium/chrome/browser/resources/welcome/google_apps/nux_google_apps.html
index a5d31e14e95..fd03465f37a 100644
--- a/chromium/chrome/browser/resources/welcome/google_apps/nux_google_apps.html
+++ b/chromium/chrome/browser/resources/welcome/google_apps/nux_google_apps.html
@@ -143,38 +143,38 @@
       /* App Icons */
       .gmail {
         content: -webkit-image-set(
-            url(chrome://theme/IDS_ONBOARDING_WELCOME_GMAIL@1x) 1x,
-            url(chrome://theme/IDS_ONBOARDING_WELCOME_GMAIL@2x) 2x);
+            url(chrome://theme/IDS_WELCOME_GMAIL@1x) 1x,
+            url(chrome://theme/IDS_WELCOME_GMAIL@2x) 2x);
       }
 
       .youtube {
         content: -webkit-image-set(
-            url(chrome://theme/IDS_ONBOARDING_WELCOME_YOUTUBE@1x) 1x,
-            url(chrome://theme/IDS_ONBOARDING_WELCOME_YOUTUBE@2x) 2x);
+            url(chrome://theme/IDS_WELCOME_YOUTUBE@1x) 1x,
+            url(chrome://theme/IDS_WELCOME_YOUTUBE@2x) 2x);
       }
 
       .maps {
         content: -webkit-image-set(
-            url(chrome://theme/IDS_ONBOARDING_WELCOME_MAPS@1x) 1x,
-            url(chrome://theme/IDS_ONBOARDING_WELCOME_MAPS@2x) 2x);
+            url(chrome://theme/IDS_WELCOME_MAPS@1x) 1x,
+            url(chrome://theme/IDS_WELCOME_MAPS@2x) 2x);
       }
 
       .translate {
         content: -webkit-image-set(
-            url(chrome://theme/IDS_ONBOARDING_WELCOME_TRANSLATE@1x) 1x,
-            url(chrome://theme/IDS_ONBOARDING_WELCOME_TRANSLATE@2x) 2x);
+            url(chrome://theme/IDS_WELCOME_TRANSLATE@1x) 1x,
+            url(chrome://theme/IDS_WELCOME_TRANSLATE@2x) 2x);
       }
 
       .news {
         content: -webkit-image-set(
-            url(chrome://theme/IDS_ONBOARDING_WELCOME_NEWS@1x) 1x,
-            url(chrome://theme/IDS_ONBOARDING_WELCOME_NEWS@2x) 2x);
+            url(chrome://theme/IDS_WELCOME_NEWS@1x) 1x,
+            url(chrome://theme/IDS_WELCOME_NEWS@2x) 2x);
       }
 
       .search {
         content: -webkit-image-set(
-            url(chrome://theme/IDS_ONBOARDING_WELCOME_SEARCH@1x) 1x,
-            url(chrome://theme/IDS_ONBOARDING_WELCOME_SEARCH@2x) 2x);
+            url(chrome://theme/IDS_WELCOME_SEARCH@1x) 1x,
+            url(chrome://theme/IDS_WELCOME_SEARCH@2x) 2x);
       }
     </style>
     <div class="apps-ask">
diff --git a/chromium/chrome/browser/resources/welcome/onboarding_welcome_resources.grd b/chromium/chrome/browser/resources/welcome/welcome_resources.grd
index 011b9b184a4..cc67d33b906 100644
--- a/chromium/chrome/browser/resources/welcome/onboarding_welcome_resources.grd
+++ b/chromium/chrome/browser/resources/welcome/welcome_resources.grd
@@ -1,199 +1,199 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
   <outputs>
-    <output filename="grit/onboarding_welcome_resources.h"
+    <output filename="grit/welcome_resources.h"
             type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
-    <output filename="grit/onboarding_welcome_resources_map.cc"
+    <output filename="grit/welcome_resources_map.cc"
             type="resource_file_map_source" />
-    <output filename="grit/onboarding_welcome_resources_map.h"
+    <output filename="grit/welcome_resources_map.h"
             type="resource_map_header" />
-    <output filename="onboarding_welcome_resources.pak"
+    <output filename="welcome_resources.pak"
             type="data_package" />
   </outputs>
   <release seq="1">
     <includes>
-      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_BLUE_CIRCLE_SVG"
+      <include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_BLUE_CIRCLE_SVG"
                file="images/background_svgs/blue_circle.svg"
                compress="gzip"
                type="BINDATA" />
-      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_GREEN_RECTANGLE_SVG"
+      <include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_GREEN_RECTANGLE_SVG"
                file="images/background_svgs/green_rectangle.svg"
                compress="gzip"
                type="BINDATA" />
-      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_GREY_OVAL_SVG"
+      <include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_GREY_OVAL_SVG"
                file="images/background_svgs/grey_oval.svg"
                compress="gzip"
                type="BINDATA" />
-      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_GREY_ROUNDED_RECTANGLE_SVG"
+      <include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_GREY_ROUNDED_RECTANGLE_SVG"
                file="images/background_svgs/grey_rounded_rectangle.svg"
                compress="gzip"
                type="BINDATA" />
-      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_RED_TRIANGLE_SVG"
+      <include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_RED_TRIANGLE_SVG"
                file="images/background_svgs/red_triangle.svg"
                compress="gzip"
                type="BINDATA" />
-      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_YELLOW_DOTS_SVG"
+      <include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_YELLOW_DOTS_SVG"
                file="images/background_svgs/yellow_dots.svg"
                compress="gzip"
                type="BINDATA" />
-      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_YELLOW_SEMICIRCLE_SVG"
+      <include name="IDR_WELCOME_IMAGES_BACKGROUND_SVGS_YELLOW_SEMICIRCLE_SVG"
                file="images/background_svgs/yellow_semicircle.svg"
                compress="gzip"
                type="BINDATA" />
     </includes>
     <structures>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_LANDING_VIEW_HTML"
+      <structure name="IDR_WELCOME_LANDING_VIEW_HTML"
                  file="landing_view.html"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_LANDING_VIEW_JS"
+      <structure name="IDR_WELCOME_LANDING_VIEW_JS"
                  file="landing_view.js"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_LANDING_VIEW_PROXY_HTML"
+      <structure name="IDR_WELCOME_LANDING_VIEW_PROXY_HTML"
                  file="landing_view_proxy.html"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_LANDING_VIEW_PROXY_JS"
+      <structure name="IDR_WELCOME_LANDING_VIEW_PROXY_JS"
                  file="landing_view_proxy.js"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_NAVIGATION_BEHAVIOR_HTML"
+      <structure name="IDR_WELCOME_NAVIGATION_BEHAVIOR_HTML"
                  file="navigation_behavior.html"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_NAVIGATION_BEHAVIOR_JS"
+      <structure name="IDR_WELCOME_NAVIGATION_BEHAVIOR_JS"
                  file="navigation_behavior.js"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ACTION_LINK_STYLE_JS"
+      <structure name="IDR_WELCOME_SHARED_ACTION_LINK_STYLE_JS"
                  file="shared/action_link_style.js"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ACTION_LINK_STYLE_CSS_HTML"
+      <structure name="IDR_WELCOME_SHARED_ACTION_LINK_STYLE_CSS_HTML"
                  file="shared/action_link_style_css.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ANIMATIONS_CSS"
+      <structure name="IDR_WELCOME_SHARED_ANIMATIONS_CSS"
                  file="shared/animations_css.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_BOOKMARK_PROXY_HTML"
+      <structure name="IDR_WELCOME_SHARED_BOOKMARK_PROXY_HTML"
                  file="shared/bookmark_proxy.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_BOOKMARK_PROXY_JS"
+      <structure name="IDR_WELCOME_SHARED_BOOKMARK_PROXY_JS"
                  file="shared/bookmark_proxy.js"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_CHOOSER_SHARED_CSS"
+      <structure name="IDR_WELCOME_SHARED_CHOOSER_SHARED_CSS"
                  file="shared/chooser_shared_css.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_I18N_SETUP_HTML"
+      <structure name="IDR_WELCOME_SHARED_I18N_SETUP_HTML"
                  file="shared/i18n_setup.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_MODULE_METRICS_PROXY_HTML"
+      <structure name="IDR_WELCOME_SHARED_MODULE_METRICS_PROXY_HTML"
                  file="shared/module_metrics_proxy.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_MODULE_METRICS_PROXY_JS"
+      <structure name="IDR_WELCOME_SHARED_MODULE_METRICS_PROXY_JS"
                  file="shared/module_metrics_proxy.js"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_NAVI_COLORS_CSS"
+      <structure name="IDR_WELCOME_SHARED_NAVI_COLORS_CSS"
                  file="shared/navi_colors_css.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ONBOARDING_BACKGROUND_HTML"
+      <structure name="IDR_WELCOME_SHARED_ONBOARDING_BACKGROUND_HTML"
                  file="shared/onboarding_background.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_ONBOARDING_BACKGROUND_JS"
+      <structure name="IDR_WELCOME_SHARED_ONBOARDING_BACKGROUND_JS"
                  file="shared/onboarding_background.js"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_STEP_INDICATOR_HTML"
+      <structure name="IDR_WELCOME_SHARED_STEP_INDICATOR_HTML"
                  file="shared/step_indicator.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_STEP_INDICATOR_JS"
+      <structure name="IDR_WELCOME_SHARED_STEP_INDICATOR_JS"
                  file="shared/step_indicator.js"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SHARED_SPLASH_PAGES_SHARED_CSS"
+      <structure name="IDR_WELCOME_SHARED_SPLASH_PAGES_SHARED_CSS"
                  file="shared/splash_pages_shared_css.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SIGNIN_VIEW_HTML"
+      <structure name="IDR_WELCOME_SIGNIN_VIEW_HTML"
                  file="signin_view.html"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SIGNIN_VIEW_JS"
+      <structure name="IDR_WELCOME_SIGNIN_VIEW_JS"
                  file="signin_view.js"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SIGNIN_VIEW_PROXY_HTML"
+      <structure name="IDR_WELCOME_SIGNIN_VIEW_PROXY_HTML"
                  file="signin_view_proxy.html"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_SIGNIN_VIEW_PROXY_JS"
+      <structure name="IDR_WELCOME_SIGNIN_VIEW_PROXY_JS"
                  file="signin_view_proxy.js"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_APP_HTML"
+      <structure name="IDR_WELCOME_APP_HTML"
                  file="welcome_app.html"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_APP_JS"
+      <structure name="IDR_WELCOME_APP_JS"
                  file="welcome_app.js"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_BROWSER_PROXY_HTML"
+      <structure name="IDR_WELCOME_BROWSER_PROXY_HTML"
                  file="welcome_browser_proxy.html"
                  compress="gzip"
                  type="chrome_html"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_BROWSER_PROXY_JS"
+      <structure name="IDR_WELCOME_BROWSER_PROXY_JS"
                  file="welcome_browser_proxy.js"
                  compress="gzip"
                  type="chrome_html"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_CSS"
+      <structure name="IDR_WELCOME_CSS"
                  file="welcome.css"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_HTML"
+      <structure name="IDR_WELCOME_HTML"
                  file="welcome.html"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_WELCOME_ONBOARDING_WELCOME_WELCOME_JS"
+      <structure name="IDR_WELCOME_JS"
                  file="welcome.js"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
 
-       <!-- NUX Google apps-->
-      <structure name="IDR_NUX_GOOGLE_APPS_HTML"
+       <!-- Google apps-->
+      <structure name="IDR_GOOGLE_APPS_HTML"
                  file="google_apps/nux_google_apps.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_NUX_GOOGLE_APPS_JS"
+      <structure name="IDR_GOOGLE_APPS_JS"
                  file="google_apps/nux_google_apps.js"
                  compress="gzip"
                  type="chrome_html" />
@@ -205,21 +205,21 @@
                  file="google_apps/google_app_proxy.js"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_NUX_SET_AS_DEFAULT_HTML"
+      <structure name="IDR_SET_AS_DEFAULT_HTML"
                  file="set_as_default/nux_set_as_default.html"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_NUX_SET_AS_DEFAULT_JS"
+      <structure name="IDR_SET_AS_DEFAULT_JS"
                  file="set_as_default/nux_set_as_default.js"
                  type="chrome_html"
                  compress="gzip"
                  preprocess="true"/>
-      <structure name="IDR_NUX_SET_AS_DEFAULT_PROXY_HTML"
+      <structure name="IDR_SET_AS_DEFAULT_PROXY_HTML"
                  file="set_as_default/nux_set_as_default_proxy.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_NUX_SET_AS_DEFAULT_PROXY_JS"
+      <structure name="IDR_SET_AS_DEFAULT_PROXY_JS"
                  file="set_as_default/nux_set_as_default_proxy.js"
                  compress="gzip"
                  type="chrome_html" />
@@ -232,28 +232,28 @@
                  compress="gzip"
                  type="chrome_html" />
 
-      <!-- NUX NTP background-->
-      <structure name="IDR_NUX_NTP_BACKGROUND_HTML"
+      <!-- NTP background-->
+      <structure name="IDR_NTP_BACKGROUND_HTML"
                  file="ntp_background/nux_ntp_background.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_NUX_NTP_BACKGROUND_JS"
+      <structure name="IDR_NTP_BACKGROUND_JS"
                  file="ntp_background/nux_ntp_background.js"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_NUX_NTP_BACKGROUND_PROXY_HTML"
+      <structure name="IDR_NTP_BACKGROUND_PROXY_HTML"
                  file="ntp_background/ntp_background_proxy.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_NUX_NTP_BACKGROUND_PROXY_JS"
+      <structure name="IDR_NTP_BACKGROUND_PROXY_JS"
                  file="ntp_background/ntp_background_proxy.js"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_NUX_NTP_BACKGROUND_METRICS_PROXY_HTML"
+      <structure name="IDR_NTP_BACKGROUND_METRICS_PROXY_HTML"
                  file="ntp_background/ntp_background_metrics_proxy.html"
                  compress="gzip"
                  type="chrome_html" />
-      <structure name="IDR_NUX_NTP_BACKGROUND_METRICS_PROXY_JS"
+      <structure name="IDR_NTP_BACKGROUND_METRICS_PROXY_JS"
                  file="ntp_background/ntp_background_metrics_proxy.js"
                  compress="gzip"
                  type="chrome_html" />