squash 'resources/unpacked/devtools' changes from 4a9a2eb..e189b9c

e189b9c DevTools: add test for for page reload with screenshots not stopping recording
6cf74fa Don't call the decomposed thing a "Cipher Suite".
663ee79 DevTools: continue recording network activity after load

git-subtree-dir: resources/unpacked/devtools
git-subtree-split: e189b9c

Author: darwin

front_end/network/NetworkPanel.js

@@ -105,6 +105,8 @@ WebInspector.NetworkPanel = function()
     WebInspector.DataSaverInfobar.maybeShowInPanel(this);
 }
 
+WebInspector.NetworkPanel.displayScreenshotDelay = 1000;
+
 WebInspector.NetworkPanel.prototype = {
     /**
      * @param {!WebInspector.Event} event
@@ -273,7 +275,13 @@ WebInspector.NetworkPanel.prototype = {
     _load: function(event)
     {
         if (this._filmStripRecorder && this._filmStripRecorder.isRecording())
-            this._pendingStopTimer = setTimeout(this._toggleRecord.bind(this, false), 1000);
+            this._pendingStopTimer = setTimeout(this._stopFilmStripRecording.bind(this), WebInspector.NetworkPanel.displayScreenshotDelay);
+    },
+
+    _stopFilmStripRecording: function()
+    {
+        this._filmStripRecorder.stopRecording(this._filmStripAvailable.bind(this));
+        delete this._pendingStopTimer;
     },
 
     _toggleLargerRequests: function()

front_end/security/SecurityPanel.js

@@ -868,7 +868,7 @@ WebInspector.SecurityOriginView = function(panel, origin, originState)
         table.addRow("Key Exchange", originState.securityDetails.keyExchange);
         if (originState.securityDetails.keyExchangeGroup)
             table.addRow("Key Exchange Group", originState.securityDetails.keyExchangeGroup);
-        table.addRow("Cipher Suite", originState.securityDetails.cipher + (originState.securityDetails.mac ? " with " + originState.securityDetails.mac : ""));
+        table.addRow("Cipher", originState.securityDetails.cipher + (originState.securityDetails.mac ? " with " + originState.securityDetails.mac : ""));
 
         // Create the certificate section outside the callback, so that it appears in the right place.
         var certificateSection = this.element.createChild("div", "origin-view-section");