Get rid of websocket_over_spdy_enabled global.

net/http/http_network_session.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_NETWORK_SESSION_H_
 #define NET_HTTP_HTTP_NETWORK_SESSION_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 100 matching lines @@
     bool enable_quic_pacing;
     bool enable_quic_time_based_loss_detection;
     bool enable_quic_persist_server_info;
     HostPortPair origin_to_force_quic_on;
     QuicClock* quic_clock;  // Will be owned by QuicStreamFactory.
     QuicRandom* quic_random;
     size_t quic_max_packet_length;
     bool enable_user_alternate_protocol_ports;
     QuicCryptoClientStreamFactory* quic_crypto_client_stream_factory;
     QuicVersionVector quic_supported_versions;
+
+    bool enable_websocket_over_spdy;

[Ryan Hamilton, 2014/05/29 19:26:50]

Looks like there is not an empty line before the other members.  When in Rome...

[mmenke, 2014/05/29 19:53:13]

Done, though not sure I agree - SPDY and QUIC settings are separated out, and I
consider this a start of a new (And hopefully never to grow) WebSocket section.

Regardless, not something I feel strongly about.

   };
 
   enum SocketPoolType {
     NORMAL_SOCKET_POOL,
     WEBSOCKET_SOCKET_POOL,
     NUM_SOCKET_POOL_TYPES
   };
 
   explicit HttpNetworkSession(const Params& params);
 
@@ skipping 104 matching lines @@
 
   std::vector<std::string> next_protos_;
   bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS];
 
   Params params_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_NETWORK_SESSION_H_