diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 21:44:19 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 21:44:19 +0000 |
| commit | ff98d7f0e27e6ce053a9359adabf2da6ceb942e5 (patch) | |
| tree | 0cd6a67b82225d481763919422f0f7d8cbcda5bf /net/spdy/spdy_websocket_test_util_spdy3.cc | |
| parent | 31029cc67439f0e23a4a43f450fa21e6818f0c20 (diff) | |
| download | chromium_src-ff98d7f0e27e6ce053a9359adabf2da6ceb942e5.zip chromium_src-ff98d7f0e27e6ce053a9359adabf2da6ceb942e5.tar.gz chromium_src-ff98d7f0e27e6ce053a9359adabf2da6ceb942e5.tar.bz2 | |
Move all objects from the spdy:: namespace to net::
Review URL: http://codereview.chromium.org/9815028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_websocket_test_util_spdy3.cc')
| -rw-r--r-- | net/spdy/spdy_websocket_test_util_spdy3.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/net/spdy/spdy_websocket_test_util_spdy3.cc b/net/spdy/spdy_websocket_test_util_spdy3.cc index 555eece..1cc6b5b 100644 --- a/net/spdy/spdy_websocket_test_util_spdy3.cc +++ b/net/spdy/spdy_websocket_test_util_spdy3.cc @@ -19,24 +19,24 @@ namespace net { namespace test_spdy3 { -spdy::SpdyFrame* ConstructSpdyWebSocketHandshakeRequestFrame( +SpdyFrame* ConstructSpdyWebSocketHandshakeRequestFrame( const char* const headers[], int header_count, - spdy::SpdyStreamId stream_id, + SpdyStreamId stream_id, RequestPriority request_priority) { // SPDY SYN_STREAM control frame header. const SpdyHeaderInfo kSynStreamHeader = { - spdy::SYN_STREAM, + SYN_STREAM, stream_id, kDefaultAssociatedStreamId, ConvertRequestPriorityToSpdyPriority(request_priority), - spdy::CONTROL_FLAG_NONE, + CONTROL_FLAG_NONE, kDefaultCompressed, - spdy::INVALID, + INVALID, kDefaultDataPointer, kDefaultDataLength, - spdy::DATA_FLAG_NONE + DATA_FLAG_NONE }; // Construct SPDY SYN_STREAM control frame. @@ -48,24 +48,24 @@ spdy::SpdyFrame* ConstructSpdyWebSocketHandshakeRequestFrame( header_count); } -spdy::SpdyFrame* ConstructSpdyWebSocketHandshakeResponseFrame( +SpdyFrame* ConstructSpdyWebSocketHandshakeResponseFrame( const char* const headers[], int header_count, - spdy::SpdyStreamId stream_id, + SpdyStreamId stream_id, RequestPriority request_priority) { // SPDY SYN_REPLY control frame header. const SpdyHeaderInfo kSynReplyHeader = { - spdy::SYN_REPLY, + SYN_REPLY, stream_id, kDefaultAssociatedStreamId, ConvertRequestPriorityToSpdyPriority(request_priority), - spdy::CONTROL_FLAG_NONE, + CONTROL_FLAG_NONE, kDefaultCompressed, - spdy::INVALID, + INVALID, kDefaultDataPointer, kDefaultDataLength, - spdy::DATA_FLAG_NONE + DATA_FLAG_NONE }; // Construct SPDY SYN_REPLY control frame. @@ -77,19 +77,19 @@ spdy::SpdyFrame* ConstructSpdyWebSocketHandshakeResponseFrame( header_count); } -spdy::SpdyFrame* ConstructSpdyWebSocketDataFrame( +SpdyFrame* ConstructSpdyWebSocketDataFrame( const char* data, int len, - spdy::SpdyStreamId stream_id, + SpdyStreamId stream_id, bool fin) { // Construct SPDY data frame. - spdy::BufferedSpdyFramer framer(3); + BufferedSpdyFramer framer(3); return framer.CreateDataFrame( stream_id, data, len, - fin ? spdy::DATA_FLAG_FIN : spdy::DATA_FLAG_NONE); + fin ? DATA_FLAG_FIN : DATA_FLAG_NONE); } } // namespace test_spdy3 |