Followup after socket tests refactoring http://codereview.chromium.org/155925

- more complete checks for data validity
- private data member with getter instead of public data member, eh
- replace some magic numbers with more readable constants

TEST=none
http://crbug.com/17445

Review URL: http://codereview.chromium.org/159514

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21957 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 2 deletions

diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index 324b70a..a4973d8 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -300,19 +300,20 @@ class TestSocketRequest : public CallbackRunner< Tuple1<int> > {
       ClientSocketPool* pool,
       std::vector<TestSocketRequest*>* request_order,
       size_t* completion_count)
-      : handle(pool),
+      : handle_(pool),
         request_order_(request_order),
         completion_count_(completion_count) {
     DCHECK(request_order);
     DCHECK(completion_count);
   }
 
-  ClientSocketHandle handle;
+  ClientSocketHandle* handle() { return &handle_; }
 
   int WaitForResult();
   virtual void RunWithParams(const Tuple1<int>& params);
 
  private:
+  ClientSocketHandle handle_;
   std::vector<TestSocketRequest*>* request_order_;
   size_t* completion_count_;
   TestCompletionCallback callback_;