1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/net/tools/flip_server/sm_connection.h b/chromium/net/tools/flip_server/sm_connection.h
index 3e217729a52..93ad42e7e5a 100644
--- a/chromium/net/tools/flip_server/sm_connection.h
+++ b/chromium/net/tools/flip_server/sm_connection.h
@@ -12,8 +12,9 @@
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "net/spdy/spdy_protocol.h"
+#include "net/tools/epoll_server/epoll_server.h"
 #include "net/tools/flip_server/create_listener.h"
-#include "net/tools/flip_server/epoll_server.h"
 #include "net/tools/flip_server/mem_cache.h"
 #include "net/tools/flip_server/ring_buffer.h"
 #include "net/tools/flip_server/sm_interface.h"
@@ -45,9 +46,9 @@ class SMConnection : public SMConnectionInterface,
   virtual ~SMConnection();
 
   static SMConnection* NewSMConnection(EpollServer* epoll_server,
-                                       SSLState *ssl_state,
+                                       SSLState* ssl_state,
                                        MemoryCache* memory_cache,
-                                       FlipAcceptor *acceptor,
+                                       FlipAcceptor* acceptor,
                                        std::string log_prefix);
 
   // TODO(mbelshe): Make these private.
@@ -99,7 +100,7 @@ class SMConnection : public SMConnectionInterface,
 
  private:
   // Decide if SPDY was negotiated.
-  bool WasSpdyNegotiated();
+  bool WasSpdyNegotiated(SpdyMajorVersion* version_negotiated);
 
   // Initialize the protocol interfaces we'll need for this connection.
   // Returns true if successful, false otherwise.
@@ -124,6 +125,7 @@ class SMConnection : public SMConnectionInterface,
                MemoryCache* memory_cache,
                FlipAcceptor* acceptor,
                std::string log_prefix);
+
  private:
   int fd_;
   int events_;
@@ -135,10 +137,10 @@ class SMConnection : public SMConnectionInterface,
 
   SMConnectionPoolInterface* connection_pool_;
 
-  EpollServer *epoll_server_;
-  SSLState *ssl_state_;
+  EpollServer* epoll_server_;
+  SSLState* ssl_state_;
   MemoryCache* memory_cache_;
-  FlipAcceptor *acceptor_;
+  FlipAcceptor* acceptor_;
   std::string client_ip_;
 
   RingBuffer read_buffer_;