[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..429ae1f216f0187f2d69f0291d4775455555facb 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -231,7 +231,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_;
@@ -716,7 +716,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_;

[akalin, 2013/10/15 00:56:07]

how'd you end up needing this? Perhaps decomp into separate CL?

[Nicolas Zea, 2013/10/15 20:07:38]

It's necessary in the case that the SocketStream is destroyed while the
read/write is still pending, in which case the Socket itself should retain
ownership of the IOBuffer (otherwise it crashes in my tests). I suppose I could
pull it into another patch, but it seems pretty minimal and is to fix something
exposed by this patch. WDYT?

[akalin, 2013/10/16 07:16:31]

Okay, fair enough. Add comment on CL description re. this?

   int pending_buf_len_;
   CompletionCallback pending_callback_;
   bool was_used_to_convey_data_;
@@ -955,7 +955,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_;