Remove the --use-spdy-over-quic command line option. Always use SPDY over QUIC.

net/quic/quic_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/quic/quic_stream_factory.h"
 
 #include <set>
 
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
@@ skipping 202 matching lines @@
   DCHECK(!factory_->HasActiveSession(host_port_proxy_pair_));
   factory_->ActivateSession(host_port_proxy_pair_, session_);
 
   return OK;
 }
 
 QuicStreamFactory::QuicStreamFactory(
     HostResolver* host_resolver,
     ClientSocketFactory* client_socket_factory,
     QuicRandom* random_generator,
-    QuicClock* clock,
-    bool use_spdy_over_quic)
+    QuicClock* clock)
     : host_resolver_(host_resolver),
       client_socket_factory_(client_socket_factory),
       random_generator_(random_generator),
       clock_(clock),
-      use_spdy_over_quic_(use_spdy_over_quic),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
 }
 
 QuicStreamFactory::~QuicStreamFactory() {
   STLDeleteElements(&all_sessions_);
   STLDeleteValues(&active_jobs_);
 }
 
 int QuicStreamFactory::Create(const HostPortProxyPair& host_port_proxy_pair,
                               const BoundNetLog& net_log,
@@ skipping 56 matching lines @@
 scoped_ptr<QuicHttpStream> QuicStreamFactory::CreateIfSessionExists(
     const HostPortProxyPair& host_port_proxy_pair,
     const BoundNetLog& net_log) {
   if (!HasActiveSession(host_port_proxy_pair)) {
     return scoped_ptr<QuicHttpStream>(NULL);
   }
 
   QuicClientSession* session = active_sessions_[host_port_proxy_pair];
   DCHECK(session);
   return scoped_ptr<QuicHttpStream>(
-      new QuicHttpStream(session->CreateOutgoingReliableStream(),
-                         use_spdy_over_quic_));
+      new QuicHttpStream(session->CreateOutgoingReliableStream()));
 }
 
 void QuicStreamFactory::OnIdleSession(QuicClientSession* session) {
 }
 
 void QuicStreamFactory::OnSessionClose(QuicClientSession* session) {
   DCHECK_EQ(0u, session->GetNumOpenStreams());
   const AliasSet& aliases = session_aliases_[session];
   for (AliasSet::const_iterator it = aliases.begin(); it != aliases.end();
        ++it) {
@@ skipping 73 matching lines @@
 void QuicStreamFactory::ActivateSession(
     const HostPortProxyPair& host_port_proxy_pair,
     QuicClientSession* session) {
   DCHECK(!HasActiveSession(host_port_proxy_pair));
   active_sessions_[host_port_proxy_pair] = session;
   session_aliases_[session].insert(host_port_proxy_pair);
 }
 
 
 }  // namespace net