Remove NPN from SSLConfig and SSLClientSocket*.

net/socket/ssl_client_socket.cc

 // Copyright (c) 2012 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/socket/ssl_client_socket.h"
 
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_util.h"
@@ skipping 39 matching lines @@
       return "h2";
     case kProtoQUIC1SPDY3:
       return "quic/1+spdy/3";
     case kProtoUnknown:
       break;
   }
   return "unknown";
 }
 
 // static
-const char* SSLClientSocket::NextProtoStatusToString(
-    const SSLClientSocket::NextProtoStatus status) {
-  switch (status) {
-    case kNextProtoUnsupported:
-      return "unsupported";
-    case kNextProtoNegotiated:
-      return "negotiated";
-    case kNextProtoNoOverlap:
-      return "no-overlap";
-  }
-  return NULL;
-}
-
-// static
 void SSLClientSocket::SetSSLKeyLogFile(
     const base::FilePath& path,
     const scoped_refptr<base::SequencedTaskRunner>& task_runner) {
 #if !defined(OS_NACL)
   SSLClientSocketImpl::SetSSLKeyLogFile(path, task_runner);
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
@@ skipping 13 matching lines @@
 #endif
 }
 
 // static
 std::vector<uint8_t> SSLClientSocket::SerializeNextProtos(
     const NextProtoVector& next_protos) {
   std::vector<uint8_t> wire_protos;
   for (const NextProto next_proto : next_protos) {
     const std::string proto = NextProtoToString(next_proto);
     if (proto.size() > 255) {
-      LOG(WARNING) << "Ignoring overlong NPN/ALPN protocol: " << proto;
+      LOG(WARNING) << "Ignoring overlong ALPN protocol: " << proto;
       continue;
     }
     if (proto.size() == 0) {
-      LOG(WARNING) << "Ignoring empty NPN/ALPN protocol";
+      LOG(WARNING) << "Ignoring empty ALPN protocol";
       continue;
     }
     wire_protos.push_back(proto.size());
     for (const char ch : proto) {
       wire_protos.push_back(static_cast<uint8_t>(ch));
     }
   }
 
   return wire_protos;
 }
 
 }  // namespace net