Update token binding code to latest drafts

net/tools/testserver/testserver.py

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This is a simple HTTP/FTP/TCP/UDP/BASIC_AUTH_PROXY/WEBSOCKET server used for
 testing Chrome.
 
 It supports several test URLs, as specified by the handlers in TestPageHandler.
 By default, it listens on an ephemeral port and sends the port number back to
@@ skipping 1516 matching lines @@
 
     ekm = self.server.tlsConnection.exportKeyingMaterial(
         "EXPORTER-Token-Binding", "", False, 32)
     self.send_response(200)
     self.send_header('Content-Type', 'application/octet-stream')
     self.end_headers()
     self.wfile.write(ekm)
     return True
 
   def ForwardTokenBindingHeader(self):
-    """Send a redirect that sets the Include-Referer-Token-Binding-ID
+    """Send a redirect that sets the Include-Referred-Token-Binding-ID
     header."""
 
     test_name = '/forward-tokbind'
     if not self._ShouldHandleRequest(test_name):
       return False
 
     query_char = self.path.find('?')
     if query_char < 0 or len(self.path) <= query_char + 1:
       self.sendRedirectHelp(test_name)
       return True
     dest = urllib.unquote(self.path[query_char + 1:])
 
     self.send_response(302)
     self.send_header('Location', dest)
-    self.send_header('Include-Referer-Token-Binding-ID', 'true')
+    self.send_header('Include-Referred-Token-Binding-ID', 'true')
     self.end_headers()
     return True
 
   def GetClientCert(self):
     """Send a reply whether a client certificate was provided."""
 
     if not self._ShouldHandleRequest('/client-cert'):
       return False
 
     self.send_response(200)
@@ skipping 635 matching lines @@
                                   'an anonymous user.')
     self.option_parser.add_option('--disable-channel-id', action='store_true')
     self.option_parser.add_option('--disable-extended-master-secret',
                                   action='store_true')
     self.option_parser.add_option('--token-binding-params', action='append',
                                   default=[], type='int')
 
 
 if __name__ == '__main__':
   sys.exit(ServerRunner().main())