Bring the gh-pages branch up to date with the master branch

netlog_viewer/spdy_view.html

Index: netlog_viewer/spdy_view.html
diff --git a/netlog_viewer/spdy_view.html b/netlog_viewer/spdy_view.html
index 54b778ffa2495cc8744cb96f9b5e5055770996e7..b6061d8bcadaf88a3acaeb4404cffea063c1f6f7 100644
--- a/netlog_viewer/spdy_view.html
+++ b/netlog_viewer/spdy_view.html
@@ -1,29 +1,30 @@
 <div id=spdy-view-tab-content class=content-box>
+  <h4>HTTP/2 status</h4>
   <ul id=spdy-view-status style='margin-top:0'>
     <!-- "enable_http2" and "enable_spdy31" are used since release 50, see
          https://crrev.com/1651123002.  "spdy_enabled" is here to support
          importing netlog json files from earlier browsers.
          TODO(bnc): Deprecate around 2016 July. -->
-    <li>HTTP/2 Enabled: <span jscontent="$this.enable_http2 == undefined ? $this.spdy_enabled : $this.enable_http2"></span></li>
-    <li>SPDY/3.1 Enabled: <span jscontent="$this.enable_spdy31 == undefined ? $this.spdy_enabled : $this.enable_spdy31"></span></li>
+    <li>HTTP/2 Enabled: <span id=spdy-view-http2-enabled></span></li>
+    <li>SPDY/3.1 Enabled: <span id=spdy-view-spdy31-enabled></span></li>
     <!-- "use_alternative_service" is used here since release 46, see
          https://crrev.com/1268313004.  "use_alternate_protocols" is here to
          support importing netlog json files from earlier browsers.
          TODO(bnc): Deprecate around 2016 February. -->
-    <li>Use Alternative Service: <span jscontent="$this.use_alternative_services == undefined ? $this.use_alternate_protocols : $this.use_alternative_services"></span></li>
+    <li>Use Alternative Service: <span id=spdy-view-alternate-service></span></li>
     <!-- "alpn_protos" and "npn_protos" are used here since release 48, see
          https://crrev.com/1387363004.  "next_protos" is here to support
          importing netlog json files from earlier browsers.
          TODO(bnc): Deprecate around 2016 April. -->
-    <li>ALPN Protocols: <span jscontent="$this.alpn_protos || $this.next_protos"></span></li>
-    <li>NPN Protocols: <span jscontent="$this.npn_protos || $this.next_protos"></span></li>
+    <li>ALPN Protocols: <span id=spdy-view-alpn-protocols></span></li>
+    <li>NPN Protocols: <span id=spdy-view-npn-protocols></span></li>
   </ul>
 
   <h4>HTTP/2 sessions</h4>
   <div id=spdy-view-session-info>
     <!-- Only one of these two are shown -->
-    <div jsdisplay="spdySessionInfo.length == 0">None</div>
-    <div jsdisplay="spdySessionInfo.length != 0">
+    <div id=spdy-view-session-info-no-content>None</div>
+    <div id=spdy-view-session-info-content>
       <a href="#events&q=type:HTTP2_SESSION%20is:active">View live HTTP/2 sessions</a>
       <p>
         <table class="styled-table">
@@ -50,30 +51,7 @@
               <th>Error</th>
             </tr>
           </thead>
-          <tbody>
-            <tr jsselect="spdySessionInfo">
-              <td><span jscontent="host_port_pair"></span>
-                <span jscontent="$this.aliases ? $this.aliases.join(' ') : ''"></span>
-              </td>
-              <td jscontent="proxy"></td>
-              <td><a jsvalues=".href: '#events&q=id:' + source_id" jscontent="source_id"></a></td>
-              <td jscontent="protocol_negotiated"></td>
-              <td jscontent="active_streams"></td>
-              <td jscontent="unclaimed_pushed_streams"></td>
-              <td jscontent="max_concurrent_streams"></td>
-              <td jscontent="streams_initiated_count"></td>
-              <td jscontent="streams_pushed_count"></td>
-              <td jscontent="streams_pushed_and_claimed_count"></td>
-              <td jscontent="streams_abandoned_count"></td>
-              <td jscontent="frames_received"></td>
-              <td jscontent="is_secure"></td>
-              <td jscontent="sent_settings"></td>
-              <td jscontent="received_settings"></td>
-              <td jscontent="send_window_size"></td>
-              <td jscontent="recv_window_size"></td>
-              <td jscontent="unacked_recv_window_bytes"></td>
-              <td jscontent="error"></td>
-            </tr>
+          <tbody id=spdy-view-session-info-tbody>
           </tbody>
         </table>
       </p>