BASELINE: Update Chromium to 56.0.2924.122

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

4 files changed, 29 insertions, 8 deletions

diff --git a/chromium/components/security_interstitials/core/browser/resources/interstitial_v2.css b/chromium/components/security_interstitials/core/browser/resources/interstitial_v2.css
index 606c7c82aad..d67982a7edd 100644
--- a/chromium/components/security_interstitials/core/browser/resources/interstitial_v2.css
+++ b/chromium/components/security_interstitials/core/browser/resources/interstitial_v2.css
@@ -61,6 +61,13 @@ button:hover {
   margin-top: 1em;
 }
 
+.debugging-content-fixed-width {
+  display: block;
+  font-family: monospace;
+  font-size: 1.2em;
+  margin-top: 0.5em;
+}
+
 .debugging-title {
   font-weight: bold;
 }
@@ -89,11 +96,11 @@ button:hover {
 }
 
 .error-code {
-  color: #696969;
+  color: #646464;
   display: inline;
   font-size: .86667em;
   margin-top: 15px;
-  opacity: .5;
+  opacity: 1;
   text-transform: uppercase;
 }
 
@@ -159,6 +166,8 @@ input[type=checkbox]:focus ~ .checkbox {
 
 #extended-reporting-opt-in label {
   position: relative;
+  display: flex;
+  align-items: flex-start;
 }
 
 .nav-wrapper {
@@ -228,6 +237,10 @@ input[type=checkbox]:focus ~ .checkbox {
       url(images/2x/captive_portal_page_icon.png) 2x);
 }
 
+.checkboxes {
+  flex: 0 0 24px;
+}
+
 .checkbox {
   background: transparent;
   border: 1px solid white;
@@ -237,7 +250,7 @@ input[type=checkbox]:focus ~ .checkbox {
   left: 0;
   position: absolute;
   right: 0;
-  top: -1px;
+  top: 3px;
   width: 14px;
 }
 
diff --git a/chromium/components/security_interstitials/core/browser/resources/interstitial_v2.html b/chromium/components/security_interstitials/core/browser/resources/interstitial_v2.html
index 401060efc43..9a3ad694433 100644
--- a/chromium/components/security_interstitials/core/browser/resources/interstitial_v2.html
+++ b/chromium/components/security_interstitials/core/browser/resources/interstitial_v2.html
@@ -27,8 +27,10 @@
       </div>
       <div id="extended-reporting-opt-in" class="hidden">
         <label>
-          <input type="checkbox" id="opt-in-checkbox">
-          <span class="checkbox"></span>
+          <div class="checkboxes">
+            <input type="checkbox" id="opt-in-checkbox">
+            <span class="checkbox"></span>
+          </div>
           <span id="opt-in-label"></span>
         </label>
       </div>
diff --git a/chromium/components/security_interstitials/core/browser/resources/interstitial_v2.js b/chromium/components/security_interstitials/core/browser/resources/interstitial_v2.js
index 332f6939fc3..d4359be4f81 100644
--- a/chromium/components/security_interstitials/core/browser/resources/interstitial_v2.js
+++ b/chromium/components/security_interstitials/core/browser/resources/interstitial_v2.js
@@ -68,8 +68,10 @@ function handleKeypress(e) {
  * (error-debugging-info) visible.
  * @param {string} title  The name of this debugging field.
  * @param {string} value  The value of the debugging field.
+ * @param {boolean=} fixedWidth If true, the value field is displayed fixed
+ *                              width.
  */
-function appendDebuggingField(title, value) {
+function appendDebuggingField(title, value, fixedWidth) {
   // The values input here are not trusted. Never use innerHTML on these
   // values!
   var spanTitle = document.createElement('span');
@@ -77,7 +79,10 @@ function appendDebuggingField(title, value) {
   spanTitle.innerText = title + ': ';
 
   var spanValue = document.createElement('span');
-  spanValue.classList.add('debugging-value');
+  spanValue.classList.add('debugging-content');
+  if (fixedWidth) {
+    spanValue.classList.add('debugging-content-fixed-width');
+  }
   spanValue.innerText = value;
 
   var pElem = document.createElement('p');
diff --git a/chromium/components/security_interstitials/core/browser/resources/ssl.js b/chromium/components/security_interstitials/core/browser/resources/ssl.js
index 2c1a2b572bd..4f180d38bfb 100644
--- a/chromium/components/security_interstitials/core/browser/resources/ssl.js
+++ b/chromium/components/security_interstitials/core/browser/resources/ssl.js
@@ -12,7 +12,8 @@ function setupSSLDebuggingInfo() {
   appendDebuggingField('Issuer', loadTimeData.getString('issuer'));
   appendDebuggingField('Expires on', loadTimeData.getString('expirationDate'));
   appendDebuggingField('Current date', loadTimeData.getString('currentDate'));
-  appendDebuggingField('PEM encoded chain', loadTimeData.getString('pem'));
+  appendDebuggingField('PEM encoded chain', loadTimeData.getString('pem'),
+                       true);
 
   $('error-code').addEventListener('click', toggleDebuggingInfo);
 }