Remove many-many SpdyMajorVersion and NextProto arguments and members.

net/tools/flip_server/sm_connection.cc

 // Copyright (c) 2009 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.
 
 #include "net/tools/flip_server/sm_connection.h"
 
 #include <errno.h>
 #include <netinet/tcp.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ skipping 286 matching lines @@
     VLOG(1) << log_prefix_ << ACCEPTOR_CLIENT_IDENT << "!!! Got HUP or ERR";
     goto handle_close_or_error;
   }
   return;
 
  handle_close_or_error:
   Cleanup("HandleEvents");
 }
 
 // Decide if SPDY was negotiated.
-bool SMConnection::WasSpdyNegotiated(SpdyMajorVersion* version_negotiated) {
-  *version_negotiated = SPDY3;
+bool SMConnection::WasSpdyNegotiated() {
   if (force_spdy())
     return true;
 
   // If this is an SSL connection, check if NPN specifies SPDY.
   if (ssl_) {
     const unsigned char* npn_proto;
     unsigned int npn_proto_len;
     SSL_get0_next_proto_negotiated(ssl_, &npn_proto, &npn_proto_len);
     if (npn_proto_len > 0) {
       std::string npn_proto_str((const char*)npn_proto, npn_proto_len);
       VLOG(1) << log_prefix_ << ACCEPTOR_CLIENT_IDENT
               << "NPN protocol detected: " << npn_proto_str;
       if (!strncmp(reinterpret_cast<const char*>(npn_proto),
                    "spdy/3",
                    npn_proto_len)) {
-        *version_negotiated = SPDY3;
         return true;
       }
       if (!strncmp(reinterpret_cast<const char*>(npn_proto),
                    "spdy/4a2",
                    npn_proto_len)) {
-        *version_negotiated = HTTP2;
         return true;
       }
     }
   }
 
   return false;
 }
 
 bool SMConnection::SetupProtocolInterfaces() {
   DCHECK(!protocol_detected_);
   protocol_detected_ = true;
 
-  SpdyMajorVersion version;
-  bool spdy_negotiated = WasSpdyNegotiated(&version);
+  bool spdy_negotiated = WasSpdyNegotiated();
   bool using_ssl = ssl_ != NULL;
 
   if (using_ssl)
     VLOG(1) << (SSL_session_reused(ssl_) ? "Resumed" : "Renegotiated")
             << " SSL Session.";
 
   if (acceptor_->spdy_only_ && !spdy_negotiated) {
     VLOG(1) << log_prefix_ << ACCEPTOR_CLIENT_IDENT
             << "SPDY proxy only, closing HTTPS connection.";
     return false;
@@ skipping 25 matching lines @@
       if (!spdy_negotiated)
         break;
     }
     // Otherwise fall through into the case below.
     case FLIP_HANDLER_SPDY_SERVER: {
       DCHECK(spdy_negotiated);
       VLOG(2) << log_prefix_ << ACCEPTOR_CLIENT_IDENT
               << (sm_spdy_interface_ ? "Creating" : "Reusing")
               << " SPDY interface.";
       if (sm_spdy_interface_)
-        sm_spdy_interface_->CreateFramer(version);
+        sm_spdy_interface_->CreateFramer();
       else
-        sm_spdy_interface_ = new SpdySM(
-            this, NULL, epoll_server_, memory_cache_, acceptor_, version);
+        sm_spdy_interface_ =
+            new SpdySM(this, NULL, epoll_server_, memory_cache_, acceptor_);
       sm_interface_ = sm_spdy_interface_;
       break;
     }
   }
 
   CorkSocket();
   if (!sm_interface_->PostAcceptHook())
     return false;
 
   return true;
@@ skipping 248 matching lines @@
 SMConnection* SMConnection::NewSMConnection(EpollServer* epoll_server,
                                             SSLState* ssl_state,
                                             MemoryCache* memory_cache,
                                             FlipAcceptor* acceptor,
                                             std::string log_prefix) {
   return new SMConnection(
       epoll_server, ssl_state, memory_cache, acceptor, log_prefix);
 }
 
 }  // namespace net