Move security error resources into security_interstitials component

BUG=488673

Review URL: https://codereview.chromium.org/1329903002

Cr-Commit-Position: refs/heads/master@{#348045}

22 files changed, 11 insertions, 5 deletions

diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 1ea11ee..0e17d0e 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -69,8 +69,6 @@
         <structure name="IDR_CUSTOM_ELEMENTS_LOGIN_JS" file="resources\chromeos\login\custom_elements_login.js" flattenhtml="true" type="chrome_html" />
       </if>
       <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_date.html" flattenhtml="true" type="chrome_html" />
-      <structure name="IDR_SECURITY_INTERSTITIAL_UI_HTML" file="resources\security_warnings\interstitial_ui.html" flattenhtml="true" type="chrome_html" />
-      <structure name="IDR_SECURITY_INTERSTITIAL_HTML" file="resources\security_warnings\interstitial_v2.html" flattenhtml="true" type="chrome_html" />
     </structures>
     <includes>
       <if expr="is_win">
diff --git a/chrome/browser/interstitials/security_interstitial_page.cc b/chrome/browser/interstitials/security_interstitial_page.cc
index b983456..876f55b 100644
--- a/chrome/browser/interstitials/security_interstitial_page.cc
+++ b/chrome/browser/interstitials/security_interstitial_page.cc
@@ -17,6 +17,7 @@
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/google/core/browser/google_util.h"
+#include "components/grit/components_resources.h"
 #include "components/security_interstitials/core/metrics_helper.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/interstitial_page.h"
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
index 980c63a..57d89df 100644
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/ssl/ssl_blocking_page.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
+#include "components/grit/components_resources.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
diff --git a/chrome/renderer/resources/neterror.html b/chrome/renderer/resources/neterror.html
index 2bd28fa..4328951 100644
--- a/chrome/renderer/resources/neterror.html
+++ b/chrome/renderer/resources/neterror.html
@@ -5,9 +5,9 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0,
                                  maximum-scale=1.0, user-scalable=no">
   <title i18n-content="title"></title>
-  <link rel="stylesheet" href="../../browser/resources/security_warnings/interstitial_v2.css">
+  <link rel="stylesheet" href="../../../components/security_interstitials/core/browser/resources/interstitial_v2.css">
   <link rel="stylesheet" href="neterror.css">
-  <script src="../../browser/resources/security_warnings/interstitial_v2_mobile.js"></script>
+  <script src="../../../components/security_interstitials/core/browser/resources/interstitial_v2_mobile.js"></script>
   <script src="neterror.js"></script>
   <script src="offline.js"></script>
 </head>
diff --git a/components/resources/components_resources.grd b/components/resources/components_resources.grd
index 289e266..dd16d05 100644
--- a/components/resources/components_resources.grd
+++ b/components/resources/components_resources.grd
@@ -12,6 +12,7 @@
       <part file="dom_distiller_resources.grdp" />
       <part file="printing_resources.grdp" />
       <part file="proximity_auth_resources.grdp" />
+      <part file="security_interstitials_resources.grdp" />
       <part file="translate_resources.grdp" />
     </includes>
   </release>
diff --git a/components/resources/security_interstitials_resources.grdp b/components/resources/security_interstitials_resources.grdp
new file mode 100644
index 0000000..907ef5f
--- /dev/null
+++ b/components/resources/security_interstitials_resources.grdp
@@ -0,0 +1,5 @@
+<?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" />
+</grit-part>
\ No newline at end of file
diff --git a/chrome/browser/resources/security_warnings/captive_portal.js b/components/security_interstitials/core/browser/resources/captive_portal.js
index 2c7c460..2c7c460 100644
--- a/chrome/browser/resources/security_warnings/captive_portal.js
+++ b/components/security_interstitials/core/browser/resources/captive_portal.js
diff --git a/chrome/browser/resources/security_warnings/extended_reporting.js b/components/security_interstitials/core/browser/resources/extended_reporting.js
index 817b3ff..817b3ff 100644
--- a/chrome/browser/resources/security_warnings/extended_reporting.js
+++ b/components/security_interstitials/core/browser/resources/extended_reporting.js
diff --git a/chrome/browser/resources/security_warnings/images/1x/brokenssl_red.png b/components/security_interstitials/core/browser/resources/images/1x/brokenssl_red.png
index cc4b1b3..cc4b1b3 100644
--- a/chrome/browser/resources/security_warnings/images/1x/brokenssl_red.png
+++ b/components/security_interstitials/core/browser/resources/images/1x/brokenssl_red.png
diff --git a/chrome/browser/resources/security_warnings/images/1x/captive_portal_page_icon.png b/components/security_interstitials/core/browser/resources/images/1x/captive_portal_page_icon.png
index 11332a0..11332a0 100644
--- a/chrome/browser/resources/security_warnings/images/1x/captive_portal_page_icon.png
+++ b/components/security_interstitials/core/browser/resources/images/1x/captive_portal_page_icon.png
diff --git a/chrome/browser/resources/security_warnings/images/1x/clock.png b/components/security_interstitials/core/browser/resources/images/1x/clock.png
index 1b1baf2..1b1baf2 100644
--- a/chrome/browser/resources/security_warnings/images/1x/clock.png
+++ b/components/security_interstitials/core/browser/resources/images/1x/clock.png
diff --git a/chrome/browser/resources/security_warnings/images/1x/stop_sign.png b/components/security_interstitials/core/browser/resources/images/1x/stop_sign.png
index f260d33..f260d33 100644
--- a/chrome/browser/resources/security_warnings/images/1x/stop_sign.png
+++ b/components/security_interstitials/core/browser/resources/images/1x/stop_sign.png
diff --git a/chrome/browser/resources/security_warnings/images/2x/brokenssl_red.png b/components/security_interstitials/core/browser/resources/images/2x/brokenssl_red.png
index bc4fa0a..bc4fa0a 100644
--- a/chrome/browser/resources/security_warnings/images/2x/brokenssl_red.png
+++ b/components/security_interstitials/core/browser/resources/images/2x/brokenssl_red.png
diff --git a/chrome/browser/resources/security_warnings/images/2x/captive_portal_page_icon.png b/components/security_interstitials/core/browser/resources/images/2x/captive_portal_page_icon.png
index b54ce21..b54ce21 100644
--- a/chrome/browser/resources/security_warnings/images/2x/captive_portal_page_icon.png
+++ b/components/security_interstitials/core/browser/resources/images/2x/captive_portal_page_icon.png
diff --git a/chrome/browser/resources/security_warnings/images/2x/clock.png b/components/security_interstitials/core/browser/resources/images/2x/clock.png
index 1f30a85..1f30a85 100644
--- a/chrome/browser/resources/security_warnings/images/2x/clock.png
+++ b/components/security_interstitials/core/browser/resources/images/2x/clock.png
diff --git a/chrome/browser/resources/security_warnings/images/2x/stop_sign.png b/components/security_interstitials/core/browser/resources/images/2x/stop_sign.png
index d91aa9c..d91aa9c 100644
--- a/chrome/browser/resources/security_warnings/images/2x/stop_sign.png
+++ b/components/security_interstitials/core/browser/resources/images/2x/stop_sign.png
diff --git a/chrome/browser/resources/security_warnings/interstitial_ui.html b/components/security_interstitials/core/browser/resources/interstitial_ui.html
index 9ec208c..9ec208c 100644
--- a/chrome/browser/resources/security_warnings/interstitial_ui.html
+++ b/components/security_interstitials/core/browser/resources/interstitial_ui.html
diff --git a/chrome/browser/resources/security_warnings/interstitial_v2.css b/components/security_interstitials/core/browser/resources/interstitial_v2.css
index 0f18465..0f18465 100644
--- a/chrome/browser/resources/security_warnings/interstitial_v2.css
+++ b/components/security_interstitials/core/browser/resources/interstitial_v2.css
diff --git a/chrome/browser/resources/security_warnings/interstitial_v2.html b/components/security_interstitials/core/browser/resources/interstitial_v2.html
index 18c1a3e..401060e 100644
--- a/chrome/browser/resources/security_warnings/interstitial_v2.html
+++ b/components/security_interstitials/core/browser/resources/interstitial_v2.html
@@ -6,7 +6,7 @@
       content="initial-scale=1, minimum-scale=1, width=device-width">
   <title i18n-content="tabTitle"></title>
   <link rel="stylesheet" href="interstitial_v2.css">
-  <script src="../../../../ui/webui/resources/js/util.js"></script>
+  <script src="../../../../../ui/webui/resources/js/util.js"></script>
   <script src="captive_portal.js"></script>
   <script src="ssl.js"></script>
   <script src="extended_reporting.js"></script>
diff --git a/chrome/browser/resources/security_warnings/interstitial_v2.js b/components/security_interstitials/core/browser/resources/interstitial_v2.js
index c8a1ce5..c8a1ce5 100644
--- a/chrome/browser/resources/security_warnings/interstitial_v2.js
+++ b/components/security_interstitials/core/browser/resources/interstitial_v2.js
diff --git a/chrome/browser/resources/security_warnings/interstitial_v2_mobile.js b/components/security_interstitials/core/browser/resources/interstitial_v2_mobile.js
index f296232..f296232 100644
--- a/chrome/browser/resources/security_warnings/interstitial_v2_mobile.js
+++ b/components/security_interstitials/core/browser/resources/interstitial_v2_mobile.js
diff --git a/chrome/browser/resources/security_warnings/ssl.js b/components/security_interstitials/core/browser/resources/ssl.js
index 2c1a2b5..2c1a2b5 100644
--- a/chrome/browser/resources/security_warnings/ssl.js
+++ b/components/security_interstitials/core/browser/resources/ssl.js