SSL: remove NOTREACHED from GetNextProto error path.

net/http/http_network_transaction.cc

 // Copyright (c) 2006-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/http/http_network_transaction.h"
 
 #include "base/format_macros.h"
 #include "base/scoped_ptr.h"
 #include "base/compiler_specific.h"
 #include "base/field_trial.h"
@@ skipping 781 matching lines @@
   ClientSocket* s = connection_->release_socket();
   s = session_->socket_factory()->CreateSSLClientSocket(
       s, request_->url.HostNoBrackets(), ssl_config_);
   connection_->set_socket(s);
   return connection_->socket()->Connect(&io_callback_, load_log_);
 }
 
 int HttpNetworkTransaction::DoSSLConnectComplete(int result) {
   SSLClientSocket* ssl_socket =
       reinterpret_cast<SSLClientSocket*>(connection_->socket());
+
+  SSLClientSocket::NextProtoStatus status =
+      SSLClientSocket::kNextProtoUnsupported;
   std::string proto;
-  SSLClientSocket::NextProtoStatus status = ssl_socket->GetNextProto(&proto);
+  // GetNextProto will fail and and trigger a NOTREACHED if we pass in a socket
+  // that hasn't had SSL_ImportFD called on it. If we get a certificate error
+  // here, then we know that we called SSL_ImportFD.
+  if (result == OK || IsCertificateError(result))
+    status = ssl_socket->GetNextProto(&proto);
   static const char kSpdyProto[] = "spdy";
-  const bool use_spdy = (status != SSLClientSocket::kNextProtoUnsupported &&
+  const bool use_spdy = (status == SSLClientSocket::kNextProtoNegotiated &&
                          proto == kSpdyProto);
 
   if (IsCertificateError(result)) {
     if (use_spdy) {
       // We currently ignore certificate errors for spdy.

[wtc, 2010/01/11 23:55:49]

Could you add a TODO comment here so we remember to remove
this at the appropriate time?  Please reference
http://crbug.com/32020.

       result = OK;
     } else {
       result = HandleCertificateError(result);
     }
   }
 
   if (result == OK) {
     DCHECK(ssl_connect_start_time_ != base::TimeTicks());
     base::TimeDelta connect_duration =
         base::TimeTicks::Now() - ssl_connect_start_time_;
@@ skipping 1045 matching lines @@
   AuthChallengeInfo* auth_info = new AuthChallengeInfo;
   auth_info->is_proxy = target == HttpAuth::AUTH_PROXY;
   auth_info->host_and_port = ASCIIToWide(GetHostAndPort(auth_origin));
   auth_info->scheme = ASCIIToWide(auth_handler_[target]->scheme());
   // TODO(eroman): decode realm according to RFC 2047.
   auth_info->realm = ASCIIToWide(auth_handler_[target]->realm());
   response_.auth_challenge = auth_info;
 }
 
 }  // namespace net