Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled.

net/spdy/spdy_test_util_common.h

 // Copyright (c) 2013 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_SPDY_SPDY_TEST_UTIL_COMMON_H_
 #define NET_SPDY_SPDY_TEST_UTIL_COMMON_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 32 matching lines @@
 class SpdyStreamRequest;
 
 // Default upload data used by both, mock objects and framer when creating
 // data frames.
 const char kDefaultURL[] = "http://www.google.com";
 const char kUploadData[] = "hello!";
 const int kUploadDataSize = arraysize(kUploadData)-1;
 
 // SpdyNextProtos returns a vector of next protocols for negotiating
 // SPDY.
-std::vector<NextProto> SpdyNextProtos();
+NextProtoVector SpdyNextProtos();
 
 // Chop a frame into an array of MockWrites.
 // |data| is the frame to chop.
 // |length| is the length of the frame to chop.
 // |num_chunks| is the number of chunks to create.
 MockWrite* ChopWriteFrame(const char* data, int length, int num_chunks);
 
 // Chop a SpdyFrame into an array of MockWrites.
 // |frame| is the frame to chop.
 // |num_chunks| is the number of chunks to create.
@@ skipping 147 matching lines @@
   scoped_ptr<DeterministicMockClientSocketFactory> deterministic_socket_factory;
   scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory;
   HttpServerPropertiesImpl http_server_properties;
   bool enable_ip_pooling;
   bool enable_compression;
   bool enable_ping;
   bool enable_user_alternate_protocol_ports;
   NextProto protocol;
   size_t stream_initial_recv_window_size;
   SpdySession::TimeFunc time_func;
+  NextProtoVector next_protos;
   std::string trusted_spdy_proxy;
+  bool force_spdy_over_ssl;
+  bool force_spdy_always;
+  bool use_alternate_protocols;
   NetLog* net_log;
 };
 
 class SpdyURLRequestContext : public URLRequestContext {
  public:
-  explicit SpdyURLRequestContext(NextProto protocol);
+  SpdyURLRequestContext(NextProto protocol,
+                        bool force_spdy_over_ssl,
+                        bool force_spdy_always);
   virtual ~SpdyURLRequestContext();
 
   MockClientSocketFactory& socket_factory() { return socket_factory_; }
 
  private:
   MockClientSocketFactory socket_factory_;
   net::URLRequestContextStorage storage_;
 };
 
 // Equivalent to pool->GetIfExists(spdy_session_key, BoundNetLog()) != NULL.
@@ skipping 301 matching lines @@
       base::StringPiece url,
       int64* content_length) const;
 
   const NextProto protocol_;
   const SpdyMajorVersion spdy_version_;
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_TEST_UTIL_COMMON_H_