Actually enable Alternate-Protocol support for QUIC.

net/http/http_stream_factory.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/http/http_stream_factory.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "googleurl/src/gurl.h"
@@ skipping 126 matching lines @@
       return true;
   return false;
 }
 
 // static
 void HttpStreamFactory::EnableNpnSpdy() {
   set_use_alternate_protocols(true);
   std::vector<std::string> next_protos;
   next_protos.push_back("http/1.1");
   next_protos.push_back("spdy/2");
+  next_protos.push_back("quic");

[willchan no longer on Chromium, 2013/06/20 17:48:08]

Does order matter? Historically order matters for this vector. But you guys
aren't actually sending this within NPN are you? I'm not understanding how this
is supposed to work.

[Ryan Hamilton, 2013/06/20 17:56:47]

I don't think that order matters.  If you notice, each of these methods calls
SetNextProtos, which simply iterates over the list and sets
enabled_protocols_[foo] = true.  As you say, we're not sending QUIC via NPN, but
rather Alternate-Protocol.  These "EnableFoo" methods which end up setting
enabled_protocols_ configure both of these mechanism.  Since we use
Alternate-Protocol, this works fine.  That being said, I re-ordered this list to
match the others (sorted alphabetically).

   SetNextProtos(next_protos);
 }
 
 // static
 void HttpStreamFactory::EnableNpnHttpOnly() {
   // Avoid alternate protocol in this case. Otherwise, browser will try SSL
   // and then fallback to http. This introduces extra load.
   set_use_alternate_protocols(false);
   std::vector<std::string> next_protos;
   next_protos.push_back("http/1.1");
   next_protos.push_back("http1.1");
   SetNextProtos(next_protos);
 }
 
 // static
 void HttpStreamFactory::EnableNpnSpdy3() {
   set_use_alternate_protocols(true);
   std::vector<std::string> next_protos;
   next_protos.push_back("http/1.1");
+  next_protos.push_back("quic");
   next_protos.push_back("spdy/2");
   next_protos.push_back("spdy/3");
   SetNextProtos(next_protos);
 }
 
 // static
 void HttpStreamFactory::EnableNpnSpdy31() {
   set_use_alternate_protocols(true);
   std::vector<std::string> next_protos;
   next_protos.push_back("http/1.1");
+  next_protos.push_back("quic");
   next_protos.push_back("spdy/2");
   next_protos.push_back("spdy/3");
   next_protos.push_back("spdy/3.1");
   SetNextProtos(next_protos);
 }
 
 // static
 void HttpStreamFactory::SetNextProtos(const std::vector<std::string>& value) {
   if (!next_protos_)
     next_protos_ = new std::vector<std::string>;
@@ skipping 20 matching lines @@
       enabled_protocols_[QUIC] = true;
     }
   }
   // TODO(rch): Remove all support for spdy/1.
   enabled_protocols_[NPN_SPDY_1] = false;
 }
 
 HttpStreamFactory::HttpStreamFactory() {}
 
 }  // namespace net