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

Unified Diff: google_apis/gcm/base/socket_stream_unittest.cc

Issue 1141453005: Remove use of deprecated DelayedSocketData gcm_unit_test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « no previous file | google_apis/gcm/engine/connection_handler_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google_apis/gcm/base/socket_stream_unittest.cc
diff --git a/google_apis/gcm/base/socket_stream_unittest.cc b/google_apis/gcm/base/socket_stream_unittest.cc
index 985d1796f3700db117a11e7f7ec03d1b410f9b54..3ca5d00748f08dabb3d6cc73bbcd07a869250d19 100644
--- a/google_apis/gcm/base/socket_stream_unittest.cc
+++ b/google_apis/gcm/base/socket_stream_unittest.cc
@@ -46,7 +46,9 @@ class GCMSocketStreamTest : public testing::Test {
void WaitForData(int msg_size);
base::MessageLoop* message_loop() { return &message_loop_; };
- net::DelayedSocketData* data_provider() { return data_provider_.get(); }
+ net::StaticSocketDataProvider* data_provider() {
+ return data_provider_.get();
+ }
SocketInputStream* input_stream() { return socket_input_stream_.get(); }
SocketOutputStream* output_stream() { return socket_output_stream_.get(); }
net::StreamSocket* socket() { return socket_.get(); }
@@ -61,7 +63,7 @@ class GCMSocketStreamTest : public testing::Test {
// SocketStreams and their data providers.
ReadList mock_reads_;
WriteList mock_writes_;
- scoped_ptr<net::DelayedSocketData> data_provider_;
+ scoped_ptr<net::StaticSocketDataProvider> data_provider_;
scoped_ptr<SocketInputStream> socket_input_stream_;
scoped_ptr<SocketOutputStream> socket_output_stream_;
@@ -86,8 +88,7 @@ void GCMSocketStreamTest::BuildSocket(const ReadList& read_list,
mock_reads_ = read_list;
mock_writes_ = write_list;
data_provider_.reset(
- new net::DelayedSocketData(
- 0,
+ new net::StaticSocketDataProvider(
vector_as_array(&mock_reads_), mock_reads_.size(),
vector_as_array(&mock_writes_), mock_writes_.size()));
socket_factory_.AddSocketDataProvider(data_provider_.get());
@@ -231,17 +232,10 @@ TEST_F(GCMSocketStreamTest, ReadAsync) {
int second_read_len = kReadDataSize - first_read_len;
ReadList read_list;
read_list.push_back(
- net::MockRead(net::SYNCHRONOUS, net::ERR_IO_PENDING));
- read_list.push_back(
net::MockRead(net::ASYNC, kReadData, first_read_len));
read_list.push_back(
net::MockRead(net::ASYNC, &kReadData[first_read_len], second_read_len));
BuildSocket(read_list, WriteList());
-
- base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(&net::DelayedSocketData::ForceNextRead,
- base::Unretained(data_provider())));
WaitForData(kReadDataSize);
ASSERT_EQ(std::string(kReadData, kReadDataSize),
DoInputStreamRead(kReadDataSize));
« no previous file with comments | « no previous file | google_apis/gcm/engine/connection_handler_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698