BASELINE: Update Chromium to 61.0.3163.99

Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

6 files changed, 13 insertions, 17 deletions

diff --git a/chromium/components/resources/OWNERS b/chromium/components/resources/OWNERS
index f846201c619..eed6b23f6bd 100644
--- a/chromium/components/resources/OWNERS
+++ b/chromium/components/resources/OWNERS
@@ -20,11 +20,6 @@ per-file neterror*=mmenke@chromium.org
 per-file ntp_tiles_resources.grdp=file://components/ntp_tiles/OWNERS
 per-file proximity_auth*=tengs@chromium.org
 per-file security_interstitials_resources.grdp=file://components/security_interstitials/OWNERS
-per-file supervised_user_error_page.grpd=file://components/supervised_user_error_page/OWNERS
-per-file sync_driver_resources.grdp=file:components/sync/OWNERS
-per-file version_ui*=achuith@chromium.org
-per-file version_ui*=bauerb@chromium.org
-per-file version_ui*=dbeam@chromium.org
-per-file version_ui*=estade@chromium.org
-per-file version_ui*=pam@chromium.org
-per-file version_ui*=xiyuan@chromium.org
+per-file supervised_user_error_page_resources.grdp=file://components/supervised_user_error_page/OWNERS
+per-file sync_driver_resources.grdp=file://components/sync/OWNERS
+per-file version_ui*=file://ui/webui/PLATFORM_OWNERS
diff --git a/chromium/components/resources/components_resources.grd b/chromium/components/resources/components_resources.grd
index cf622dcbc4c..ec0dffdd4bd 100644
--- a/chromium/components/resources/components_resources.grd
+++ b/chromium/components/resources/components_resources.grd
@@ -19,6 +19,7 @@
       <part file="physical_web_ui_resources.grdp" />
       <part file="printing_resources.grdp" />
       <part file="proximity_auth_resources.grdp" />
+      <part file="safe_browsing_resources.grdp" />
       <part file="security_interstitials_resources.grdp" />
       <part file="signin_resources.grdp" />
       <part file="supervised_user_error_page_resources.grdp" />
diff --git a/chromium/components/resources/flags_ui_resources.grdp b/chromium/components/resources/flags_ui_resources.grdp
index 383f224e528..f5e599c8fa7 100644
--- a/chromium/components/resources/flags_ui_resources.grdp
+++ b/chromium/components/resources/flags_ui_resources.grdp
@@ -2,7 +2,4 @@
 <grit-part>
   <include name="IDR_FLAGS_UI_FLAGS_HTML" file="../flags_ui/resources/flags.html" flattenhtml="true" type="BINDATA" />
   <include name="IDR_FLAGS_UI_FLAGS_JS" file="../flags_ui/resources/flags.js" type="BINDATA" />
-  <if expr="is_ios">
-    <include name="IDR_APPLE_FLAGS_HTML" file="../flags_ui/resources/apple_flags.html" flattenhtml="true" type="BINDATA" />
-  </if>
 </grit-part>
diff --git a/chromium/components/resources/ntp_tiles_resources.grdp b/chromium/components/resources/ntp_tiles_resources.grdp
index 7d8d6c0a63c..9367081c3b1 100644
--- a/chromium/components/resources/ntp_tiles_resources.grdp
+++ b/chromium/components/resources/ntp_tiles_resources.grdp
@@ -1,9 +1,6 @@
 <?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 expr="_google_chrome">
       <then>
         <include name="IDR_DEFAULT_POPULAR_SITES_JSON" file="../ntp_tiles/resources/internal/default_popular_sites.json" type="BINDATA" />
diff --git a/chromium/components/resources/safe_browsing_resources.grdp b/chromium/components/resources/safe_browsing_resources.grdp
new file mode 100644
index 00000000000..1b2d2115da3
--- /dev/null
+++ b/chromium/components/resources/safe_browsing_resources.grdp
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+  <include name="IDR_SAFE_BROWSING_HTML" file="..\..\components\safe_browsing\web_ui\resources\safe_browsing.html" type="BINDATA" />
+  <include name="IDR_SAFE_BROWSING_CSS" file="..\..\components\safe_browsing\web_ui\resources\safe_browsing.css" type="BINDATA" />
+  <include name="IDR_SAFE_BROWSING_JS" file="..\..\components\safe_browsing\web_ui\resources\safe_browsing.js" type="BINDATA" />
+</grit-part>
diff --git a/chromium/components/resources/security_interstitials_resources.grdp b/chromium/components/resources/security_interstitials_resources.grdp
index 2fb0f05ce92..4d72526b941 100644
--- a/chromium/components/resources/security_interstitials_resources.grdp
+++ b/chromium/components/resources/security_interstitials_resources.grdp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  <include name="IDR_SECURITY_INTERSTITIAL_UI_HTML" file="../security_interstitials/core/browser/resources/interstitial_ui.html" flattenhtml="true" type="BINDATA" />
-  <include name="IDR_SECURITY_INTERSTITIAL_HTML" file="../security_interstitials/core/browser/resources/interstitial_v2.html" flattenhtml="true" type="BINDATA" />
+  <include name="IDR_SECURITY_INTERSTITIAL_UI_HTML" file="../security_interstitials/core/browser/resources/list_of_interstitials.html" flattenhtml="true" type="BINDATA" />
+  <include name="IDR_SECURITY_INTERSTITIAL_HTML" file="../security_interstitials/core/browser/resources/interstitial_large.html" flattenhtml="true" type="BINDATA" />
   <include name="IDR_SECURITY_INTERSTITIAL_QUIET_HTML" file="../security_interstitials/core/browser/resources/interstitial_webview_quiet.html" flattenhtml="true" type="BINDATA" />
-</grit-part>
\ No newline at end of file
+</grit-part>