Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 8 insertions, 0 deletions

diff --git a/net/socket/client_socket.h b/net/socket/client_socket.h
index b4173c0..358716c 100644
--- a/net/socket/client_socket.h
+++ b/net/socket/client_socket.h
@@ -69,6 +69,10 @@ class ClientSocket : public Socket {
   // this call to the transport socket.
   virtual bool WasEverUsed() const = 0;
 
+  // Returns true if the underlying transport socket is using TCP FastOpen.
+  // TCP FastOpen is an experiment with sending data in the TCP SYN packet.
+  virtual bool UsingTCPFastOpen() const = 0;
+
  protected:
   // The following class is only used to gather statistics about the history of
   // a socket.  It is only instantiated and used in basic sockets, such as
@@ -80,6 +84,10 @@ class ClientSocket : public Socket {
     UseHistory();
     ~UseHistory();
 
+    // Resets the state of UseHistory and emits histograms for the
+    // current state.
+    void Reset();
+
     void set_was_ever_connected();
     void set_was_used_to_convey_data();