BASELINE: Update Chromium to 56.0.2924.122

Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

51 files changed, 12 insertions, 26 deletions

diff --git a/chromium/components/resources/BUILD.gn b/chromium/components/resources/BUILD.gn
index 93d9f9ae0f5..4384ea21b73 100644
--- a/chromium/components/resources/BUILD.gn
+++ b/chromium/components/resources/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//printing/features/features.gni")
 import("//tools/grit/grit_rule.gni")
 import("//third_party/brotli/brotli.gni")
 
@@ -30,6 +31,7 @@ grit("components_resources") {
     "-E",
     "about_credits_file=" + rebase_path(about_credits_file_bro, root_build_dir),
   ]
+  defines = [ "enable_print_preview=$enable_print_preview" ]
 
   deps = [
     ":compressed_about_credits",
diff --git a/chromium/components/resources/OWNERS b/chromium/components/resources/OWNERS
index 806568dd8a3..a573f6c2cd2 100644
--- a/chromium/components/resources/OWNERS
+++ b/chromium/components/resources/OWNERS
@@ -21,6 +21,7 @@ per-file gcm_driver_resources.grdp=peter@chromium.org
 per-file gcm_driver_resources.grdp=zea@chromium.org
 per-file neterror*=mmenke@chromium.org
 per-file neterror*=juliatuttle@chromium.org
+per-file ntp_tiles.grdp=file://components/ntp_tiles/OWNERS
 per-file proximity_auth*=isherman@chromium.org
 per-file proximity_auth*=tengs@chromium.org
 per-file supervised_user_error_page.grpd=aberent@chromium.org
diff --git a/chromium/components/resources/components_resources.grd b/chromium/components/resources/components_resources.grd
index 4a7e4df347b..cf622dcbc4c 100644
--- a/chromium/components/resources/components_resources.grd
+++ b/chromium/components/resources/components_resources.grd
@@ -15,6 +15,7 @@
       <part file="gcm_driver_resources.grdp" />
       <part file="net_log_resources.grdp" />
       <part file="neterror_resources.grdp" />
+      <part file="ntp_tiles_resources.grdp" />
       <part file="physical_web_ui_resources.grdp" />
       <part file="printing_resources.grdp" />
       <part file="proximity_auth_resources.grdp" />
diff --git a/chromium/components/resources/components_scaled_resources.grd b/chromium/components/resources/components_scaled_resources.grd
index ace356f01eb..240326772de 100644
--- a/chromium/components/resources/components_scaled_resources.grd
+++ b/chromium/components/resources/components_scaled_resources.grd
@@ -16,7 +16,6 @@
       <part file="crash_scaled_resources.grdp" />
       <part file="flags_ui_scaled_resources.grdp" />
       <part file="neterror_scaled_resources.grdp" />
-      <part file="omnibox_scaled_resources.grdp" />
       <part file="version_ui_scaled_resources.grdp" />
 
       <!-- Generic resources -->
diff --git a/chromium/components/resources/default_100_percent/neterror/download.png b/chromium/components/resources/default_100_percent/neterror/download.png
new file mode 100644
index 00000000000..d400472fd64
--- /dev/null
+++ b/chromium/components/resources/default_100_percent/neterror/download.png
diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_search_button_loupe.png b/chromium/components/resources/default_100_percent/neterror/search_glass.png
index 2b7834cf9fb..2b7834cf9fb 100644
--- a/chromium/components/resources/default_100_percent/omnibox/omnibox_search_button_loupe.png
+++ b/chromium/components/resources/default_100_percent/neterror/search_glass.png
diff --git a/chromium/components/resources/default_100_percent/omnibox/controlled_setting_mandatory.png b/chromium/components/resources/default_100_percent/omnibox/controlled_setting_mandatory.png
deleted file mode 100644
index 5735ead5f59..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/controlled_setting_mandatory.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_history.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_history.png
deleted file mode 100644
index 9b63e262a6e..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_history.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_history_incognito.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_history_incognito.png
deleted file mode 100644
index 418d0b47930..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_history_incognito.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_http.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_http.png
deleted file mode 100644
index 8de583e19ec..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_http.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_http_incognito.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_http_incognito.png
deleted file mode 100644
index 2f5e5e8da47..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_http_incognito.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_https_invalid.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_https_invalid.png
deleted file mode 100644
index ba50e5ed4f7..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_https_invalid.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_https_valid.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_https_valid.png
deleted file mode 100644
index 9337d655876..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_https_valid.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_search.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_search.png
deleted file mode 100644
index 2a8eb966bce..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_search.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_search_incognito.png b/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_search_incognito.png
deleted file mode 100644
index 4c84df09857..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/ios/omnibox_search_incognito.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/location_bar_http.png b/chromium/components/resources/default_100_percent/omnibox/location_bar_http.png
deleted file mode 100644
index dd2cf041957..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/location_bar_http.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_calculator.png b/chromium/components/resources/default_100_percent/omnibox/omnibox_calculator.png
deleted file mode 100644
index de99d5a1bf7..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/omnibox_calculator.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_extension_app.png b/chromium/components/resources/default_100_percent/omnibox/omnibox_extension_app.png
deleted file mode 100644
index 73251fcee47..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/omnibox_extension_app.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_http.png b/chromium/components/resources/default_100_percent/omnibox/omnibox_http.png
deleted file mode 100644
index e7494a7f63f..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/omnibox_http.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_https_invalid.png b/chromium/components/resources/default_100_percent/omnibox/omnibox_https_invalid.png
deleted file mode 100644
index 0493dadb8fd..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/omnibox_https_invalid.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_https_valid.png b/chromium/components/resources/default_100_percent/omnibox/omnibox_https_valid.png
deleted file mode 100644
index dd176c5ca1f..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/omnibox_https_valid.png
+++ /dev/null
diff --git a/chromium/components/resources/default_100_percent/omnibox/omnibox_search.png b/chromium/components/resources/default_100_percent/omnibox/omnibox_search.png
deleted file mode 100644
index e271f751a07..00000000000
--- a/chromium/components/resources/default_100_percent/omnibox/omnibox_search.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/neterror/download.png b/chromium/components/resources/default_200_percent/neterror/download.png
new file mode 100644
index 00000000000..f53cc0c62c2
--- /dev/null
+++ b/chromium/components/resources/default_200_percent/neterror/download.png
diff --git a/chromium/components/resources/default_200_percent/omnibox/omnibox_search_button_loupe.png b/chromium/components/resources/default_200_percent/neterror/search_glass.png
index 21fbe66f2fa..21fbe66f2fa 100644
--- a/chromium/components/resources/default_200_percent/omnibox/omnibox_search_button_loupe.png
+++ b/chromium/components/resources/default_200_percent/neterror/search_glass.png
diff --git a/chromium/components/resources/default_200_percent/omnibox/controlled_setting_mandatory.png b/chromium/components/resources/default_200_percent/omnibox/controlled_setting_mandatory.png
deleted file mode 100644
index ae0fee0ffaf..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/controlled_setting_mandatory.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_history.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_history.png
deleted file mode 100644
index a1ee7772926..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_history.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_history_incognito.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_history_incognito.png
deleted file mode 100644
index 6738098fa68..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_history_incognito.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_http.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_http.png
deleted file mode 100644
index cf21532d1eb..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_http.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_http_incognito.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_http_incognito.png
deleted file mode 100644
index adb55f15801..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_http_incognito.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_https_invalid.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_https_invalid.png
deleted file mode 100644
index f797139c638..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_https_invalid.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_https_valid.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_https_valid.png
deleted file mode 100644
index 092bf9b6be2..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_https_valid.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_search.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_search.png
deleted file mode 100644
index 72c30de64b2..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_search.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_search_incognito.png b/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_search_incognito.png
deleted file mode 100644
index a1aaa55a963..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/ios/omnibox_search_incognito.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/location_bar_http.png b/chromium/components/resources/default_200_percent/omnibox/location_bar_http.png
deleted file mode 100644
index 12935710699..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/location_bar_http.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/omnibox_extension_app.png b/chromium/components/resources/default_200_percent/omnibox/omnibox_extension_app.png
deleted file mode 100644
index 7474a39a0c5..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/omnibox_extension_app.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/omnibox_http.png b/chromium/components/resources/default_200_percent/omnibox/omnibox_http.png
deleted file mode 100644
index ed146bdb415..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/omnibox_http.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/omnibox_https_invalid.png b/chromium/components/resources/default_200_percent/omnibox/omnibox_https_invalid.png
deleted file mode 100644
index e36f83363d0..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/omnibox_https_invalid.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/omnibox_https_valid.png b/chromium/components/resources/default_200_percent/omnibox/omnibox_https_valid.png
deleted file mode 100644
index 963354bea59..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/omnibox_https_valid.png
+++ /dev/null
diff --git a/chromium/components/resources/default_200_percent/omnibox/omnibox_search.png b/chromium/components/resources/default_200_percent/omnibox/omnibox_search.png
deleted file mode 100644
index 46bc10496d7..00000000000
--- a/chromium/components/resources/default_200_percent/omnibox/omnibox_search.png
+++ /dev/null
diff --git a/chromium/components/resources/default_300_percent/omnibox/controlled_setting_mandatory.png b/chromium/components/resources/default_300_percent/omnibox/controlled_setting_mandatory.png
deleted file mode 100644
index b83207eb119..00000000000
--- a/chromium/components/resources/default_300_percent/omnibox/controlled_setting_mandatory.png
+++ /dev/null
diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_history.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_history.png
deleted file mode 100644
index cf654021734..00000000000
--- a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_history.png
+++ /dev/null
diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_history_incognito.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_history_incognito.png
deleted file mode 100644
index 44537f1279e..00000000000
--- a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_history_incognito.png
+++ /dev/null
diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_http.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_http.png
deleted file mode 100644
index 28301841b6e..00000000000
--- a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_http.png
+++ /dev/null
diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_http_incognito.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_http_incognito.png
deleted file mode 100644
index 3cb92d65396..00000000000
--- a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_http_incognito.png
+++ /dev/null
diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_https_invalid.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_https_invalid.png
deleted file mode 100644
index 2b6326183fb..00000000000
--- a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_https_invalid.png
+++ /dev/null
diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_https_valid.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_https_valid.png
deleted file mode 100644
index c4511c636c9..00000000000
--- a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_https_valid.png
+++ /dev/null
diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_search.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_search.png
deleted file mode 100644
index 79ed6e0c41c..00000000000
--- a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_search.png
+++ /dev/null
diff --git a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_search_incognito.png b/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_search_incognito.png
deleted file mode 100644
index 1892d6f170d..00000000000
--- a/chromium/components/resources/default_300_percent/omnibox/ios/omnibox_search_incognito.png
+++ /dev/null
diff --git a/chromium/components/resources/default_300_percent/omnibox/omnibox_extension_app.png b/chromium/components/resources/default_300_percent/omnibox/omnibox_extension_app.png
deleted file mode 100644
index 590daaff23d..00000000000
--- a/chromium/components/resources/default_300_percent/omnibox/omnibox_extension_app.png
+++ /dev/null
diff --git a/chromium/components/resources/ntp_tiles_resources.grdp b/chromium/components/resources/ntp_tiles_resources.grdp
new file mode 100644
index 00000000000..dadacfabb41
--- /dev/null
+++ b/chromium/components/resources/ntp_tiles_resources.grdp
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+  <if expr="is_android or is_ios">
+    <include name="IDR_POPULAR_SITES_INTERNALS_HTML" file="../ntp_tiles/webui/resources/popular_sites_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+    <include name="IDR_POPULAR_SITES_INTERNALS_JS" file="../ntp_tiles/webui/resources/popular_sites_internals.js" type="BINDATA" />
+    <include name="IDR_POPULAR_SITES_INTERNALS_CSS" file="../ntp_tiles/webui/resources/popular_sites_internals.css" type="BINDATA" />
+  </if>
+</grit-part>
diff --git a/chromium/components/resources/omnibox_scaled_resources.grdp b/chromium/components/resources/omnibox_scaled_resources.grdp
deleted file mode 100644
index 1c69a1f6a97..00000000000
--- a/chromium/components/resources/omnibox_scaled_resources.grdp
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grit-part>
-  <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CALCULATOR" file="omnibox/omnibox_calculator.png" />
-  <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EXTENSION_APP" file="omnibox/omnibox_extension_app.png" />
-  <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_POLICY_WARNING" file="omnibox/controlled_setting_mandatory.png" />
-  <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH_BUTTON_LOUPE" file="omnibox/omnibox_search_button_loupe.png" />
-  <if expr="is_ios">
-    <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_HTTP" file="omnibox/ios/omnibox_http.png" />
-    <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HISTORY" file="omnibox/ios/omnibox_history.png" />
-    <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HISTORY_INCOGNITO" file="omnibox/ios/omnibox_history_incognito.png" />
-    <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTP" file="omnibox/ios/omnibox_http.png" />
-    <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_INVALID" file="omnibox/ios/omnibox_https_invalid.png" />
-    <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_VALID" file="omnibox/ios/omnibox_https_valid.png" />
-    <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTP_INCOGNITO" file="omnibox/ios/omnibox_http_incognito.png" />
-    <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH" file="omnibox/ios/omnibox_search.png" />
-    <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH_INCOGNITO" file="omnibox/ios/omnibox_search_incognito.png" />
-  </if>
-  <if expr="not is_ios">
-    <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_HTTP" file="omnibox/location_bar_http.png" />
-    <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTP" file="omnibox/omnibox_http.png" />
-    <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_INVALID" file="omnibox/omnibox_https_invalid.png" />
-    <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_VALID" file="omnibox/omnibox_https_valid.png" />
-    <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH" file="omnibox/omnibox_search.png" />
-  </if>
-</grit-part>