Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: net/spdy/spdy_test_util_common.h

Issue 295383007: Get rid of websocket_over_spdy_enabled global. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with fixed linebreaks Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/spdy/spdy_test_util_common.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_SPDY_SPDY_TEST_UTIL_COMMON_H_ 5 #ifndef NET_SPDY_SPDY_TEST_UTIL_COMMON_H_
6 #define NET_SPDY_SPDY_TEST_UTIL_COMMON_H_ 6 #define NET_SPDY_SPDY_TEST_UTIL_COMMON_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 bool enable_ping; 216 bool enable_ping;
217 bool enable_user_alternate_protocol_ports; 217 bool enable_user_alternate_protocol_ports;
218 NextProto protocol; 218 NextProto protocol;
219 size_t stream_initial_recv_window_size; 219 size_t stream_initial_recv_window_size;
220 SpdySession::TimeFunc time_func; 220 SpdySession::TimeFunc time_func;
221 NextProtoVector next_protos; 221 NextProtoVector next_protos;
222 std::string trusted_spdy_proxy; 222 std::string trusted_spdy_proxy;
223 bool force_spdy_over_ssl; 223 bool force_spdy_over_ssl;
224 bool force_spdy_always; 224 bool force_spdy_always;
225 bool use_alternate_protocols; 225 bool use_alternate_protocols;
226 bool enable_websocket_over_spdy;
226 NetLog* net_log; 227 NetLog* net_log;
227 }; 228 };
228 229
229 class SpdyURLRequestContext : public URLRequestContext { 230 class SpdyURLRequestContext : public URLRequestContext {
230 public: 231 public:
231 SpdyURLRequestContext(NextProto protocol, 232 SpdyURLRequestContext(NextProto protocol,
232 bool force_spdy_over_ssl, 233 bool force_spdy_over_ssl,
233 bool force_spdy_always); 234 bool force_spdy_always);
234 virtual ~SpdyURLRequestContext(); 235 virtual ~SpdyURLRequestContext();
235 236
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 base::StringPiece url, 546 base::StringPiece url,
546 int64* content_length) const; 547 int64* content_length) const;
547 548
548 const NextProto protocol_; 549 const NextProto protocol_;
549 const SpdyMajorVersion spdy_version_; 550 const SpdyMajorVersion spdy_version_;
550 }; 551 };
551 552
552 } // namespace net 553 } // namespace net
553 554
554 #endif // NET_SPDY_SPDY_TEST_UTIL_COMMON_H_ 555 #endif // NET_SPDY_SPDY_TEST_UTIL_COMMON_H_
OLDNEW
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/spdy/spdy_test_util_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698