[GCM] Initial work to set up directory structure and introduce socket integration

net/socket/socket_test_util.h

Index: net/socket/socket_test_util.h
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index e4e56522c9253ea80295dc980c8ac551ae38a6c1..f1345637fa2ba81238a206982be95d0f0c741856 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -201,6 +201,7 @@ class AsyncSocket {
   // part of this call.
   virtual void OnReadComplete(const MockRead& data) = 0;
   virtual void OnConnectComplete(const MockConnect& data) = 0;
+  virtual void OnWriteComplete(const MockWriteResult& result) = 0;

[Ryan Sleevi, 2013/09/03 23:04:08]

For review sake, and because socket_test_util itself is a huge file, can we
split this into a separate CL?

[Ryan Sleevi, 2013/09/03 23:04:08]

So, OnReadComplete is meant to be consumed by DelayedSocketData. That is, it's
"public", but it's supposed to be an implementation detail of the whole Socket
util stuff.

I don't see you actually using the OnWriteComplete interface here - instead,
you're using it to handle ordrering/sequencing outside of this file, and that
gives me a little concern.

This is more of a design issue on the net/ OWNERs side, in that it's not clear
how to 'best'/'correctly' use these interfaces. 

[Nicolas Zea, 2013/09/07 01:07:52]

These changes have been reverted now that I don't have a custom data provider.

 };
 
 // SocketDataProvider which responds based on static tables of mock reads and
@@ -231,7 +232,7 @@ class StaticSocketDataProvider : public SocketDataProvider {
   // SocketDataProvider implementation.
   virtual MockRead GetNextRead() OVERRIDE;
   virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE;
-  ;  virtual void Reset() OVERRIDE;
+  virtual void Reset() OVERRIDE;
 
  private:
   MockRead* reads_;
@@ -699,6 +700,7 @@ class MockTCPClientSocket : public MockClientSocket, public AsyncSocket {
   // AsyncSocket:
   virtual void OnReadComplete(const MockRead& data) OVERRIDE;
   virtual void OnConnectComplete(const MockConnect& data) OVERRIDE;
+  virtual void OnWriteComplete(const MockWriteResult& result) OVERRIDE;
 
  private:
   int CompleteRead();
@@ -716,7 +718,7 @@ class MockTCPClientSocket : public MockClientSocket, public AsyncSocket {
   bool peer_closed_connection_;
 
   // While an asynchronous IO is pending, we save our user-buffer state.
-  IOBuffer* pending_buf_;
+  scoped_refptr<IOBuffer> pending_buf_;

[Ryan Sleevi, 2013/09/03 23:04:08]

While I agree that this is the right change, in order to match the interface,
I'm curious if you ran into a bug when working on this.

[Nicolas Zea, 2013/09/07 01:07:52]

Yep, in particular when handling a timeout, as the IOBuffer is discarded in my
socket stream when the stream is closed. If the read then finishes at a later
time it'll try to write into the buffer, but because it hadn't added a reference
it's already been destroyed by then.

   int pending_buf_len_;
   CompletionCallback pending_callback_;
   bool was_used_to_convey_data_;
@@ -807,6 +809,7 @@ class DeterministicMockUDPClientSocket
   // AsyncSocket implementation.
   virtual void OnReadComplete(const MockRead& data) OVERRIDE;
   virtual void OnConnectComplete(const MockConnect& data) OVERRIDE;
+  virtual void OnWriteComplete(const MockWriteResult& result) OVERRIDE;
 
  private:
   bool connected_;
@@ -850,6 +853,7 @@ class DeterministicMockTCPClientSocket
   // AsyncSocket:
   virtual void OnReadComplete(const MockRead& data) OVERRIDE;
   virtual void OnConnectComplete(const MockConnect& data) OVERRIDE;
+  virtual void OnWriteComplete(const MockWriteResult& result) OVERRIDE;
 
  private:
   DeterministicSocketHelper helper_;
@@ -893,6 +897,7 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket {
   // This MockSocket does not implement the manual async IO feature.
   virtual void OnReadComplete(const MockRead& data) OVERRIDE;
   virtual void OnConnectComplete(const MockConnect& data) OVERRIDE;
+  virtual void OnWriteComplete(const MockWriteResult& result) OVERRIDE;
 
   virtual bool WasChannelIDSent() const OVERRIDE;
   virtual void set_channel_id_sent(bool channel_id_sent) OVERRIDE;
@@ -938,6 +943,7 @@ class MockUDPClientSocket
   // AsyncSocket implementation.
   virtual void OnReadComplete(const MockRead& data) OVERRIDE;
   virtual void OnConnectComplete(const MockConnect& data) OVERRIDE;
+  virtual void OnWriteComplete(const MockWriteResult& result) OVERRIDE;
 
  private:
   int CompleteRead();
@@ -955,7 +961,7 @@ class MockUDPClientSocket
   IPEndPoint peer_addr_;
 
   // While an asynchronous IO is pending, we save our user-buffer state.
-  IOBuffer* pending_buf_;
+  scoped_refptr<IOBuffer> pending_buf_;
   int pending_buf_len_;
   CompletionCallback pending_callback_;