Remove use of deprecated DelayedSocketData gcm_unit_test.

Review URL: https://codereview.chromium.org/1141453005

Cr-Commit-Position: refs/heads/master@{#330814}

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());
@@ -230,18 +231,11 @@ TEST_F(GCMSocketStreamTest, ReadAsync) {
   int first_read_len = kReadDataSize / 2;
   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));

google_apis/gcm/engine/connection_handler_impl_unittest.cc

@@ -118,7 +118,9 @@ class GCMConnectionHandlerImplTest : public testing::Test {
     return connection_handler_.get();
   }
   base::MessageLoop* message_loop() { return &message_loop_; };
-  net::DelayedSocketData* data_provider() { return data_provider_.get(); }
+  net::StaticSocketDataProvider* data_provider() {
+    return data_provider_.get();
+  }
   int last_error() const { return last_error_; }
 
   // Initialize the connection handler, setting |dst_proto| as the destination
@@ -136,7 +138,7 @@ class GCMConnectionHandlerImplTest : public testing::Test {
   // SocketStreams and their data provider.
   ReadList mock_reads_;
   WriteList mock_writes_;
-  scoped_ptr<net::DelayedSocketData> data_provider_;
+  scoped_ptr<net::StaticSocketDataProvider> data_provider_;
 
   // The connection handler being tested.
   scoped_ptr<ConnectionHandlerImpl> connection_handler_;
@@ -169,7 +171,7 @@ net::StreamSocket* GCMConnectionHandlerImplTest::BuildSocket(
   mock_reads_ = read_list;
   mock_writes_ = write_list;
   data_provider_.reset(
-      new net::DelayedSocketData(0,
+      new net::StaticSocketDataProvider(
           &(mock_reads_[0]), mock_reads_.size(),
           &(mock_writes_[0]), mock_writes_.size()));
   socket_factory_.AddSocketDataProvider(data_provider_.get());
@@ -571,9 +573,6 @@ TEST_F(GCMConnectionHandlerImplTest, ReadTimeout) {
   EXPECT_FALSE(received_message.get());
   EXPECT_EQ(net::ERR_TIMED_OUT, last_error());
   EXPECT_FALSE(connection_handler()->CanSendMessage());
-
-  // Finish the socket read. Should have no effect.
-  data_provider()->ForceNextRead();
 }
 
 // Receive a message with zero data bytes.