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

Unified Diff: net/spdy/spdy_websocket_stream_unittest.cc

Issue 9251019: Fixes to socket_test_util.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renamed blocked_ -> read_in_progress_. Created 8 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_stream_unittest.cc ('k') | net/websockets/websocket_job_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_websocket_stream_unittest.cc
diff --git a/net/spdy/spdy_websocket_stream_unittest.cc b/net/spdy/spdy_websocket_stream_unittest.cc
index 0acbd0d02110b8328427c320649048cc8afe18cf..088244b2bd5d875f077406fae5160effa9c13b07 100644
--- a/net/spdy/spdy_websocket_stream_unittest.cc
+++ b/net/spdy/spdy_websocket_stream_unittest.cc
@@ -159,7 +159,7 @@ class SpdyWebSocketStreamEventRecorder : public SpdyWebSocketStream::Delegate {
class SpdyWebSocketStreamTest : public testing::Test {
public:
- OrderedSocketData* data() { return data_; }
+ OrderedSocketData* data() { return data_.get(); }
void DoSendHelloFrame(SpdyWebSocketStreamEvent* event) {
websocket_stream_->SendData(kMessageFrame, kMessageFrameLength);
@@ -252,7 +252,8 @@ class SpdyWebSocketStreamTest : public testing::Test {
int InitSession(MockRead* reads, size_t reads_count,
MockWrite* writes, size_t writes_count,
bool throttling) {
- data_ = new OrderedSocketData(reads, reads_count, writes, writes_count);
+ data_.reset(new OrderedSocketData(reads, reads_count,
+ writes, writes_count));
session_deps_.socket_factory->AddSocketDataProvider(data_.get());
http_session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_);
SpdySessionPool* spdy_session_pool(http_session_->spdy_session_pool());
@@ -289,7 +290,7 @@ class SpdyWebSocketStreamTest : public testing::Test {
spdy::SpdySettings spdy_settings_to_set_;
spdy::SpdySettings spdy_settings_to_send_;
SpdySessionDependencies session_deps_;
- scoped_refptr<OrderedSocketData> data_;
+ scoped_ptr<OrderedSocketData> data_;
scoped_refptr<HttpNetworkSession> http_session_;
scoped_refptr<SpdySession> session_;
scoped_refptr<TransportSocketParams> transport_params_;
« no previous file with comments | « net/spdy/spdy_stream_unittest.cc ('k') | net/websockets/websocket_job_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698