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

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

Issue 9582034: Fork SPDY/2 and SPDY/3 versions of our SPDY tests, in preparation for landing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix merge bug Created 8 years, 9 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/spdy/spdy_test_util_spdy3.cc ('k') | net/spdy/spdy_websocket_stream_spdy2_unittest.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_WEBSOCKET_STREAM_H_ 5 #ifndef NET_SPDY_SPDY_WEBSOCKET_STREAM_H_
6 #define NET_SPDY_SPDY_WEBSOCKET_STREAM_H_ 6 #define NET_SPDY_SPDY_WEBSOCKET_STREAM_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 virtual int OnSendBodyComplete(int status, bool* eof) OVERRIDE; 74 virtual int OnSendBodyComplete(int status, bool* eof) OVERRIDE;
75 virtual int OnResponseReceived(const spdy::SpdyHeaderBlock& response, 75 virtual int OnResponseReceived(const spdy::SpdyHeaderBlock& response,
76 base::Time response_time, 76 base::Time response_time,
77 int status) OVERRIDE; 77 int status) OVERRIDE;
78 virtual void OnDataReceived(const char* data, int length) OVERRIDE; 78 virtual void OnDataReceived(const char* data, int length) OVERRIDE;
79 virtual void OnDataSent(int length) OVERRIDE; 79 virtual void OnDataSent(int length) OVERRIDE;
80 virtual void OnClose(int status) OVERRIDE; 80 virtual void OnClose(int status) OVERRIDE;
81 virtual void set_chunk_callback(ChunkCallback* callback) OVERRIDE; 81 virtual void set_chunk_callback(ChunkCallback* callback) OVERRIDE;
82 82
83 private: 83 private:
84 FRIEND_TEST_ALL_PREFIXES(SpdyWebSocketStreamTest, Basic); 84 FRIEND_TEST_ALL_PREFIXES(SpdyWebSocketStreamSpdy2Test, Basic);
85 FRIEND_TEST_ALL_PREFIXES(SpdyWebSocketStreamSpdy3Test, Basic);
85 86
86 void OnSpdyStreamCreated(int status); 87 void OnSpdyStreamCreated(int status);
87 88
88 scoped_refptr<SpdyStream> stream_; 89 scoped_refptr<SpdyStream> stream_;
89 scoped_refptr<SpdySession> spdy_session_; 90 scoped_refptr<SpdySession> spdy_session_;
90 Delegate* delegate_; 91 Delegate* delegate_;
91 92
92 DISALLOW_COPY_AND_ASSIGN(SpdyWebSocketStream); 93 DISALLOW_COPY_AND_ASSIGN(SpdyWebSocketStream);
93 }; 94 };
94 95
95 } // namespace net 96 } // namespace net
96 97
97 #endif // NET_SPDY_SPDY_WEBSOCKET_STREAM_H_ 98 #endif // NET_SPDY_SPDY_WEBSOCKET_STREAM_H_
OLDNEW
« no previous file with comments | « net/spdy/spdy_test_util_spdy3.cc ('k') | net/spdy/spdy_websocket_stream_spdy2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698