Update Token Binding code to the latest drafts

net/http/http_stream.h

Index: net/http/http_stream.h
diff --git a/net/http/http_stream.h b/net/http/http_stream.h
index a1e476e22bfca09499985a611426acc72b2bb125..0b8a037c99f07366fbf0e217fe1722a66678e6bd 100644
--- a/net/http/http_stream.h
+++ b/net/http/http_stream.h
@@ -22,6 +22,7 @@
 #include "net/base/net_errors.h"
 #include "net/base/net_export.h"
 #include "net/base/request_priority.h"
+#include "net/ssl/token_binding.h"
 
 namespace crypto {
 class ECPrivateKey;
@@ -157,10 +158,12 @@ class NET_EXPORT_PRIVATE HttpStream {
   // and does not modify |endpoint| if it is unavailable.
   virtual bool GetRemoteEndpoint(IPEndPoint* endpoint) = 0;
 
-  // Signs the EKM value for Token Binding from the TLS layer using |*key| and
-  // puts the result in |*out|. Returns OK or ERR_FAILED.
-  virtual Error GetSignedEKMForTokenBinding(crypto::ECPrivateKey* key,
-                                            std::vector<uint8_t>* out) = 0;
+  // Generates the signature used in Token Binding using |*key| and for a Token
+  // Binding of type |tb_type|, putting the signature in |*out|. Returns OK or
+  // ERR_FAILED.
+  virtual Error GetTokenBindingSignature(crypto::ECPrivateKey* key,
+                                         TokenBindingType tb_type,
+                                         std::vector<uint8_t>* out) = 0;
 
   // In the case of an HTTP error or redirect, flush the response body (usually
   // a simple error or "this page has moved") so that we can re-use the